texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Use contents instead of args for brace commands i


From: Patrice Dumas
Subject: branch master updated: Use contents instead of args for brace commands in Texinfo tree
Date: Tue, 24 Dec 2024 09:33:44 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 6ad7393ed2 Use contents instead of args for brace commands in Texinfo 
tree
6ad7393ed2 is described below

commit 6ad7393ed21dc4ce27d9c97e0bc80a65d7a5c2a6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 11 11:46:13 2024 +0100

    Use contents instead of args for brace commands in Texinfo tree
    
    * tp/Texinfo/ParserNonXS.pm (_handle_comma): rename $brace_command as
    $command_element.
    
    * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/ParserNonXS.pm
    (_end_line_starting_block, _new_value_element, _handle_open_brace)
    (_handle_close_brace, _handle_comma, _process_remaining_on_line),
    tp/Texinfo/Translations.pm (_substitute_element_array),
    tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
    tp/Texinfo/XS/main/translations.c (substitute_element_array),
    tp/Texinfo/XS/main/utils.c (get_label_element),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
    tp/Texinfo/XS/parsetexi/parser.c (new_value_element)
    (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
    (handle_open_brace, handle_close_brace, handle_comma): use contents
    instead of args for brace command arguments in Texinfo tree.
    
    * tp/Texinfo/Structuring.pm (check_nodes_are_referenced),
    tp/Texinfo/Transformations.pm (fill_gaps_in_sectioning)
    (_reference_to_arg, _protect_hashchar_at_line_beginning),
    tp/Texinfo/ManipulateTree.pm (_new_asis_command_with_text)
    (_protect_text, protect_first_parenthesis),
    tp/Texinfo/XS/main/manipulate_tree.c (new_asis_command_with_text)
    (protect_text), tp/Texinfo/XS/structuring_transfo/structuring.c
    (check_nodes_are_referenced, associate_internal_references),
    tp/Texinfo/XS/structuring_transfo/transformations.c
    (protect_first_parenthesis, fill_gaps_in_sectioning)
    (reference_to_arg_internal)
    (protect_hashchar_at_line_beginning_internal): update structuring and
    transformations for change of args to contents for brace commands.
    
    * tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
    tp/Texinfo/Convert/DocBook.pm (conversion_output_begin, _index_entry)
    (_convert), tp/Texinfo/Convert/HTML.pm (_internal_command_tree)
    (_convert_explained_command, _convert_listoffloats_command)
    (_convert_float_command, _convert_xref_commands)
    (_convert_printindex_command, _default_format_single_footnote)
    (_prepare_converted_output_info, _convert), tp/Texinfo/Convert/Info.pm
    (format_ref, format_image), tp/Texinfo/Convert/LaTeX.pm (_title)
    (_begin_document, _index_entry, _convert),
    tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
    tp/Texinfo/Convert/Plaintext.pm (%ignored_commands, process_footnotes)
    (process_printindex, format_ref, image_formatted_text, format_image)
    (_convert), tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
    (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
    (_convert), tp/Texinfo/Convert/Text.pm (_convert),
    tp/Texinfo/Convert/Utils.pm (definition_category_tree)
    (find_innermost_accent_contents), tp/Texinfo/Indices.pm
    (_idx_leading_text_or_command), tp/Texinfo/ManipulateTree.pm
    (_new_asis_command_with_text, _protect_text)
    (protect_first_parenthesis), tp/Texinfo/XS/convert/convert_html.c
    (html_prepare_converted_output_info, html_convert_tree_append)
    (html_node_redirections), tp/Texinfo/XS/convert/converter.c
    (table_item_content_tree), tp/Texinfo/XS/convert/format_html.c
    (html_internal_command_tree, html_default_format_single_footnote)
    (html_convert_explained_command, html_convert_xref_command)
    (html_convert_float_command, html_convert_listoffloats_command)
    (html_convert_printindex_command),
    tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
    (convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
    (convert_to_text_internal), tp/Texinfo/XS/main/convert_utils.c
    (find_innermost_accent_contents),
    tp/Texinfo/XS/main/manipulate_indices.c (idx_leading_text_or_command),
    tp/Texinfo/XS/main/node_name_normalization.c
    (convert_to_normalized_internal), tp/ext/latex2html.pm (l2h_process),
    tp/ext/tex4ht.pm (tex4ht_prepare): update conversion for change of
    args to contents for brace commands.  call get_label_element more.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert),
    tp/Texinfo/Convert/LaTeX.pm (_convert),
    tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
    tp/Texinfo/XS/main/node_name_normalization.c
    (convert_to_normalized_internal): return right after formatting brace
    commands.
    
    * tp/init/documentation_examples.pm
    (my_test_documentation_convert_xref_commands), tp/t/01use.t,
    tp/t/init/footnote_mark_in_inline_content.pm
    (_texi2any_test_format_single_footnote_in_inline_content): update
    tests init files and manually written tree.
    
    * tp/t/09indices.t: change code order.
---
 ChangeLog                                          |   86 +
 tp/Texinfo/Common.pm                               |    5 +-
 tp/Texinfo/Convert/Converter.pm                    |    2 +-
 tp/Texinfo/Convert/DocBook.pm                      |  114 +-
 tp/Texinfo/Convert/HTML.pm                         |   64 +-
 tp/Texinfo/Convert/Info.pm                         |   26 +-
 tp/Texinfo/Convert/LaTeX.pm                        |  181 +-
 tp/Texinfo/Convert/NodeNameNormalization.pm        |   18 +-
 tp/Texinfo/Convert/Plaintext.pm                    |  147 +-
 tp/Texinfo/Convert/Texinfo.pm                      |   46 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |   56 +-
 tp/Texinfo/Convert/TexinfoXML.pm                   |    3 +
 tp/Texinfo/Convert/Text.pm                         |   52 +-
 tp/Texinfo/Convert/Utils.pm                        |    6 +-
 tp/Texinfo/Indices.pm                              |    5 +-
 tp/Texinfo/ManipulateTree.pm                       |   14 +-
 tp/Texinfo/ParserNonXS.pm                          |   68 +-
 tp/Texinfo/Structuring.pm                          |    8 +-
 tp/Texinfo/Transformations.pm                      |   12 +-
 tp/Texinfo/Translations.pm                         |    2 +-
 tp/Texinfo/XS/convert/convert_html.c               |   52 +-
 tp/Texinfo/XS/convert/converter.c                  |    2 +-
 tp/Texinfo/XS/convert/format_html.c                |   45 +-
 tp/Texinfo/XS/main/build_perl_info.c               |    2 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |   56 +-
 tp/Texinfo/XS/main/convert_to_text.c               |   44 +-
 tp/Texinfo/XS/main/convert_utils.c                 |    6 +-
 tp/Texinfo/XS/main/manipulate_indices.c            |    4 +-
 tp/Texinfo/XS/main/manipulate_tree.c               |    6 +-
 tp/Texinfo/XS/main/node_name_normalization.c       |   19 +-
 tp/Texinfo/XS/main/translations.c                  |    2 +-
 tp/Texinfo/XS/main/utils.c                         |    5 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |    2 +-
 tp/Texinfo/XS/parsetexi/parser.c                   |    4 +-
 tp/Texinfo/XS/parsetexi/separator.c                |  114 +-
 tp/Texinfo/XS/structuring_transfo/structuring.c    |   15 +-
 .../XS/structuring_transfo/transformations.c       |   12 +-
 tp/ext/latex2html.pm                               |    2 +-
 tp/ext/tex4ht.pm                                   |    2 +-
 tp/init/documentation_examples.pm                  |    2 +-
 tp/t/01use.t                                       |    4 +-
 tp/t/09indices.t                                   |    2 +-
 tp/t/init/footnote_mark_in_inline_content.pm       |    2 +-
 tp/t/results/alias/alias_of_definfoenclose.pl      |    4 +-
 ...lias_of_definfoenclose_before_definfoenclose.pl |    4 +-
 tp/t/results/alias/alias_zero.pl                   |    4 +-
 tp/t/results/alias/bad_line.pl                     |    4 +-
 tp/t/results/alias/recursive_alias.pl              |    4 +-
 tp/t/results/alias/simple.pl                       |    8 +-
 tp/t/results/alias/texinfo_command_alias.pl        |    4 +-
 .../alias/texinfo_command_alias_indirect_before.pl |    4 +-
 tp/t/results/columnfractions/wrong_command.pl      |    4 +-
 tp/t/results/conditionals/empty_set_in_ifset.pl    |    6 +-
 tp/t/results/conditionals/end_ifset_in_format.pl   |    4 +-
 tp/t/results/conditionals/ifset_in_command.pl      |    4 +-
 .../conditionals/inlinefmtifelse_nesting.pl        |    8 +-
 .../conditionals/inlineiffmtifelse_not_closed.pl   |    4 +-
 .../inlineiffmtifelse_not_closed_three_arg.pl      |    4 +-
 .../inlineiffmtifelse_not_closed_two_arg.pl        |    4 +-
 .../conditionals/inlineifset_false_not_closed.pl   |    4 +-
 tp/t/results/conditionals/value_on_ifset.pl        |    6 +-
 tp/t/results/converters_tests/accent_with_text.pl  |   28 +-
 .../results/converters_tests/at_commands_in_raw.pl |   42 +-
 tp/t/results/converters_tests/combined_fonts.pl    |  180 +-
 tp/t/results/converters_tests/commands_in_sc.pl    |   92 +-
 .../commands_in_settitle_with_title.pl             |   52 +-
 tp/t/results/converters_tests/commands_in_var.pl   |   92 +-
 tp/t/results/converters_tests/complex_nestings.pl  |    8 +-
 .../conversion_with_undef_customization.pl         |   16 +-
 .../converters_tests/definition_commands.pl        | 1474 ++++++------
 tp/t/results/converters_tests/empty_accent.pl      |    4 +-
 .../results/converters_tests/footnote_no_number.pl |    8 +-
 .../footnote_no_number_separate.pl                 |    8 +-
 tp/t/results/converters_tests/form_feeds.pl        |   46 +-
 .../converters_tests/frenchspacing_and_code.pl     |   40 +-
 tp/t/results/converters_tests/image_extension.pl   |    4 +-
 tp/t/results/converters_tests/image_formatting.pl  |  176 +-
 tp/t/results/converters_tests/image_with_spaces.pl |  Bin 4149 -> 4157 bytes
 tp/t/results/converters_tests/inline.pl            |   60 +-
 tp/t/results/converters_tests/inline_expand_tex.pl |   56 +-
 tp/t/results/converters_tests/inlinefmtifelse.pl   |   40 +-
 .../inlinefmtifelse_with_commands.pl               |   48 +-
 tp/t/results/converters_tests/inlinefmtspaces.pl   |   16 +-
 .../results/converters_tests/inlineifsetifclear.pl |   16 +-
 .../converters_tests/inlineifsetifclearspaces.pl   |   16 +-
 tp/t/results/converters_tests/inlinerawspaces.pl   |   16 +-
 tp/t/results/converters_tests/link.pl              |   36 +-
 .../converters_tests/multitable_prototypes.pl      |   12 +-
 .../converters_tests/normal_font_in_monospace.pl   |   20 +-
 .../results/converters_tests/raw_block_commands.pl |    8 +-
 .../raw_block_commands_expand_tex.pl               |    8 +-
 .../converters_tests/ref_error_formatting.pl       |  334 +--
 tp/t/results/converters_tests/ref_in_sectioning.pl |  124 +-
 .../reference_for_formatting_customizations.pl     |   12 +-
 .../references_to_top_no_top_output.pl             |   72 +-
 tp/t/results/converters_tests/refs_formatting.pl   |  348 +--
 .../some_at_commands_in_ref_nodes.pl               |  300 +--
 .../converters_tests/spaces_in_empty_node_names.pl |   40 +-
 .../converters_tests/spaces_in_node_names.pl       |   46 +-
 .../test_formatting_customizations.pl              |   12 +-
 .../converters_tests/things_before_setfilename.pl  |   52 +-
 .../things_before_setfilename_no_element.pl        |   52 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  348 +--
 tp/t/results/converters_tests/unknown_value.pl     |    6 +-
 .../various_itemize_command_as_argument.pl         |    4 +-
 .../various_vtable_command_as_argument.pl          |    4 +-
 tp/t/results/coverage/accent_and_dash.pl           |    4 +-
 tp/t/results/coverage/accent_no_closed.pl          |    4 +-
 tp/t/results/coverage/accent_no_closed_comment.pl  |    4 +-
 tp/t/results/coverage/accent_no_closed_newline.pl  |    4 +-
 .../results/coverage/accent_no_closed_paragraph.pl |    4 +-
 tp/t/results/coverage/accents_errors.pl            |   16 +-
 .../coverage/arg_in_brace_no_arg_command.pl        |    4 +-
 tp/t/results/coverage/block_commands.pl            |    4 +-
 tp/t/results/coverage/cartouche.pl                 |    4 +-
 .../coverage/cartouche_title_and_content.pl        |    4 +-
 tp/t/results/coverage/center.pl                    |    4 +-
 tp/t/results/coverage/command_in_end.pl            |   28 +-
 .../command_in_end_expanded_raw_command_after.pl   |    4 +-
 ...mand_in_end_expanded_raw_command_empty_after.pl |    4 +-
 .../command_in_end_expanded_raw_in_command.pl      |    4 +-
 ..._in_end_expanded_raw_one_char_before_command.pl |    4 +-
 ..._in_end_expanded_raw_one_char_not_in_command.pl |    4 +-
 ..._in_end_expanded_raw_two_char_before_command.pl |    4 +-
 ..._in_end_expanded_raw_two_char_not_in_command.pl |    4 +-
 .../command_in_end_ignored_raw_command_after.pl    |    4 +-
 tp/t/results/coverage/commands.pl                  |   52 +-
 tp/t/results/coverage/commands_in_math.pl          |  356 +--
 tp/t/results/coverage/comment_on_cartouche_line.pl |    4 +-
 tp/t/results/coverage/def.pl                       |   40 +-
 tp/t/results/coverage/displaymath.pl               |   16 +-
 tp/t/results/coverage/empty_w.pl                   |    8 +-
 .../end_bad_end_argument_and_superfluous_arg.pl    |    4 +-
 tp/t/results/coverage/exdent_and_formats.pl        |    4 +-
 tp/t/results/coverage/hyphenation.pl               |    4 +-
 tp/t/results/coverage/indicateurl_end_lines.pl     |    8 +-
 tp/t/results/coverage/invalid_U.pl                 |   36 +-
 .../results/coverage/lettered_accent_and_spaces.pl |   32 +-
 tp/t/results/coverage/math.pl                      |   36 +-
 tp/t/results/coverage/not_i_j_in_dotless.pl        |   12 +-
 .../coverage/punctuation_in_line_commands.pl       |   12 +-
 tp/t/results/coverage/quotation_author.pl          |    4 +-
 .../coverage/spaces_after_braced_command.pl        |   16 +-
 tp/t/results/coverage/test_errormsg.pl             |   16 +-
 tp/t/results/coverage/test_tie.pl                  |    4 +-
 tp/t/results/coverage/test_today.pl                |    4 +-
 tp/t/results/coverage/titlefont_in_center.pl       |    4 +-
 tp/t/results/coverage/unknown_accents.pl           |  100 +-
 tp/t/results/coverage_braces/abbr_acronym.pl       |   56 +-
 tp/t/results/coverage_braces/anchor_not_closed.pl  |    4 +-
 .../coverage_braces/brace_opened_no_command.pl     |    4 +-
 tp/t/results/coverage_braces/caption_not_closed.pl |    4 +-
 tp/t/results/coverage_braces/code_not_closed.pl    |    4 +-
 tp/t/results/coverage_braces/command_in_U.pl       |    8 +-
 tp/t/results/coverage_braces/command_in_dotless.pl |    8 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   72 +-
 .../definfoenclose_texinfo_commands.pl             |   12 +-
 .../results/coverage_braces/email_possibilities.pl |   12 +-
 tp/t/results/coverage_braces/empty_commands.pl     |   36 +-
 tp/t/results/coverage_braces/empty_images.pl       |   16 +-
 .../coverage_braces/empty_line_in_anchor.pl        |    4 +-
 .../empty_line_in_braces_in_math.pl                |    4 +-
 .../empty_line_in_braces_in_math_at_begin_line.pl  |    4 +-
 .../results/coverage_braces/empty_line_in_email.pl |    4 +-
 tp/t/results/coverage_braces/empty_line_in_math.pl |    4 +-
 tp/t/results/coverage_braces/empty_ref.pl          |   16 +-
 .../coverage_braces/empty_second_email_argument.pl |    4 +-
 tp/t/results/coverage_braces/end_line_in_anchor.pl |    4 +-
 tp/t/results/coverage_braces/footnote.pl           |    8 +-
 .../footnote_ending_on_empty_line.pl               |    4 +-
 .../footnote_ending_on_empty_line_spaces.pl        |    4 +-
 .../footnote_in_command_not_closed.pl              |    8 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |    4 +-
 .../results/coverage_braces/footnote_not_closed.pl |    4 +-
 .../format_on_first_footnote_line.pl               |    8 +-
 .../results/coverage_braces/heading_in_footnote.pl |    4 +-
 .../coverage_braces/inforef_too_much_args.pl       |    6 +-
 tp/t/results/coverage_braces/kbd.pl                |   28 +-
 .../math_bracketed_inside_not_closed.pl            |    4 +-
 .../coverage_braces/math_bracketed_not_closed.pl   |    4 +-
 .../math_bracketed_not_closed_next_line.pl         |    4 +-
 .../math_leading_trailing_spaces.pl                |    4 +-
 tp/t/results/coverage_braces/math_not_closed.pl    |    4 +-
 tp/t/results/coverage_braces/nested.pl             |    8 +-
 tp/t/results/coverage_braces/nested_args.pl        |   26 +-
 tp/t/results/coverage_braces/nested_in_sc.pl       |   40 +-
 .../coverage_braces/no_brace_space_end_line.pl     |    4 +-
 .../one_argument_leading_trailing_spaces.pl        |   60 +-
 tp/t/results/coverage_braces/recursive_acronym.pl  |    8 +-
 .../recursive_acronym_definition.pl                |   12 +-
 tp/t/results/coverage_braces/ref_empty_node.pl     |   16 +-
 .../coverage_braces/ref_in_style_command.pl        |   12 +-
 tp/t/results/coverage_braces/simple.pl             |    4 +-
 .../coverage_braces/space_command_in_image.pl      |    8 +-
 tp/t/results/coverage_braces/space_in_anchor.pl    |    4 +-
 tp/t/results/coverage_braces/space_in_footnote.pl  |    4 +-
 tp/t/results/coverage_braces/space_in_image.pl     |    8 +-
 tp/t/results/coverage_braces/test_image.pl         |  204 +-
 tp/t/results/coverage_braces/test_w.pl             |   76 +-
 tp/t/results/coverage_braces/too_much_args.pl      |    4 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |   16 +-
 .../two_footnotes_in_nodes_separate.pl             |   16 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |   16 +-
 tp/t/results/coverage_braces/unmatched_brace.pl    |    8 +-
 tp/t/results/coverage_braces/uref_in_ref.pl        |   24 +-
 tp/t/results/coverage_braces/uref_url.pl           |   36 +-
 .../uref_with_commands_characters.pl               |   16 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |   14 +-
 tp/t/results/coverage_braces/w_end_sentence.pl     |    4 +-
 tp/t/results/def/all_commands_delimiters.pl        |  830 +++----
 .../def/all_commands_delimiters_printindex.pl      |  830 +++----
 tp/t/results/def/ampchar.pl                        |    8 +-
 tp/t/results/def/code_in_def.pl                    |    8 +-
 tp/t/results/def/def_defx_mismatch.pl              |    8 +-
 tp/t/results/def/def_groupings_args.pl             |   32 +-
 tp/t/results/def/deftypeline.pl                    |   12 +-
 tp/t/results/def/defx_after_comment.pl             |   10 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   10 +-
 tp/t/results/def/defx_after_empty_line.pl          |   10 +-
 .../def/defx_after_empty_line_in_example.pl        |   10 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   10 +-
 .../def/defx_after_preformatted_with_text.pl       |   10 +-
 tp/t/results/def/defx_after_text.pl                |   10 +-
 tp/t/results/def/defx_in_example.pl                |   10 +-
 tp/t/results/def/empty_def_arguments.pl            |   18 +-
 tp/t/results/def/empty_deftypeop_name.pl           |   12 +-
 .../def/end_of_lines_protected_in_footnote.pl      |    4 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |   30 +-
 .../def/inter_item_commands_in_def_in_example.pl   |   30 +-
 tp/t/results/def/ref_in_def.pl                     |   80 +-
 tp/t/results/def/text_block_before_defline.pl      |    4 +-
 .../docbook_tests/between_node_and_section.pl      |    4 +-
 tp/t/results/float/anchor_in_caption.pl            |    8 +-
 tp/t/results/float/cindex_in_caption.pl            |    6 +-
 tp/t/results/float/complex_float.pl                |  240 +-
 tp/t/results/float/empty_caption.pl                |   16 +-
 .../float/empty_listoffloats_with_floats.pl        |    8 +-
 tp/t/results/float/float_copying.pl                |   22 +-
 tp/t/results/float/float_in_block_commands.pl      |   12 +-
 tp/t/results/float/float_type_with_tieaccent.pl    |   32 +-
 tp/t/results/float/float_with_at_commands.pl       |   36 +-
 tp/t/results/float/footnote_in_caption.pl          |    8 +-
 .../results/float/footnote_in_caption_and_error.pl |    8 +-
 tp/t/results/float/listoffloats_with_commands.pl   |    8 +-
 .../float/numbering_captions_listoffloats.pl       |  218 +-
 tp/t/results/float/ref_to_float.pl                 |   12 +-
 tp/t/results/float/simple.pl                       |    4 +-
 .../float/special_characters_in_float_type.pl      |   20 +-
 tp/t/results/formats_encodings/accent.pl           |  296 +--
 .../formats_encodings/accent_argument_non_ascii.pl |    8 +-
 .../formats_encodings/accent_enable_encoding.pl    |  296 +--
 tp/t/results/formats_encodings/accentenc.pl        |  296 +--
 .../formats_encodings/accentenc_enable_encoding.pl |  296 +--
 .../formats_encodings/at_commands_in_refs.pl       | 2528 ++++++++++----------
 .../at_commands_in_refs_latin1.pl                  | 2528 ++++++++++----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 2528 ++++++++++----------
 .../char_latin1_latin1_in_refs.pl                  |   30 +-
 .../char_latin2_latin2_in_refs.pl                  |    6 +-
 .../char_us_ascii_latin1_in_refs.pl                |   30 +-
 .../formats_encodings/char_utf8_latin1_in_refs.pl  |   30 +-
 .../documentencoding_utf8_and_insertions.pl        |   16 +-
 .../dotless_argument_non_ascii.pl                  |    8 +-
 .../formats_encodings/japanese_shift_jis.pl        |   12 +-
 .../manual_simple_latin1_with_error.pl             |    6 +-
 .../manual_simple_utf8_with_error.pl               |    6 +-
 .../multiple_include_encodings.pl                  |    6 +-
 .../no_documentencoding_and_insertions.pl          |   16 +-
 .../formats_encodings/verb_delimiter_not_ascii.pl  |    4 +-
 tp/t/results/formats_encodings/weird_accents.pl    |   56 +-
 .../weird_accents_disable_encoding.pl              |   56 +-
 tp/t/results/heading/heading_in_copying.pl         |    8 +-
 tp/t/results/heading/heading_in_example.pl         |    4 +-
 tp/t/results/heading/heading_in_quotation.pl       |    4 +-
 tp/t/results/html_tests/U_in_index.pl              |   12 +-
 .../html_tests/acronym_in_node_and_section.pl      |   16 +-
 tp/t/results/html_tests/anchor_on_vtable_item.pl   |   14 +-
 .../html_tests/base_for_css_info_in_init_test.pl   |   16 +-
 tp/t/results/html_tests/check_htmlxref.pl          |   20 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |   20 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |   20 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |   20 +-
 .../html_tests/command_in_node_redirection.pl      |    8 +-
 .../command_in_node_redirection_multiple.pl        |   36 +-
 .../command_in_node_redirection_other_command.pl   |   12 +-
 .../command_in_node_redirection_same_command.pl    |   12 +-
 .../command_in_node_redirection_two_commands.pl    |   16 +-
 tp/t/results/html_tests/commands_in_abbr.pl        |   16 +-
 tp/t/results/html_tests/commands_in_alt.pl         |   16 +-
 tp/t/results/html_tests/commands_in_email.pl       |   12 +-
 .../html_tests/css_in_node_redirection_page.pl     |    8 +-
 tp/t/results/html_tests/documentdescription.pl     |   36 +-
 ...sive_self_section_reference_node_no_use_node.pl |   12 +-
 tp/t/results/html_tests/empty_titlefont.pl         |    4 +-
 tp/t/results/html_tests/end_of_line_in_uref.pl     |    4 +-
 .../file_name_case_insensitive_conflict_node.pl    |   16 +-
 ...se_insensitive_conflict_node_no_redirections.pl |   16 +-
 ..._name_case_insensitive_conflict_redirections.pl |   28 +-
 .../html_tests/file_name_conflict_with_Top.pl      |    4 +-
 .../html_tests/file_name_conflict_with_section.pl  |    4 +-
 .../file_name_conflict_with_user_defined.pl        |    4 +-
 .../html_tests/filenameconflictwithnonsplit.pl     |    4 +-
 .../filenameconflictwithspecialelement.pl          |    8 +-
 tp/t/results/html_tests/float_copying.pl           |   46 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |    4 +-
 .../html_tests/footnotestyle_separate_late.pl      |    8 +-
 tp/t/results/html_tests/fractions_rounding.pl      |   16 +-
 .../html_tests/headings_after_lone_nodes.pl        |    4 +-
 tp/t/results/html_tests/image_link_prefix.pl       |    4 +-
 tp/t/results/html_tests/inline_in_node.pl          |   24 +-
 tp/t/results/html_tests/itemize_arguments.pl       |  388 +--
 .../itemize_arguments_enable_encoding.pl           |  388 +--
 tp/t/results/html_tests/itemize_tieaccent.pl       |   88 +-
 tp/t/results/html_tests/letter_command_in_index.pl |   12 +-
 tp/t/results/html_tests/mathjax_with_texinfo.pl    |   32 +-
 .../mathjax_with_texinfo_enable_encoding.pl        |   32 +-
 .../html_tests/mathjax_with_texinfo_html_file.pl   |   32 +-
 .../html_tests/mathjax_with_texinfo_html_text.pl   |   32 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   32 +-
 tp/t/results/html_tests/no_use_iso.pl              |    4 +-
 tp/t/results/html_tests/node_footnote_end.pl       |   64 +-
 tp/t/results/html_tests/node_footnote_separated.pl |   64 +-
 tp/t/results/html_tests/node_footnote_use_node.pl  |   64 +-
 .../html_tests/node_footnote_use_node_separate.pl  |   64 +-
 .../html_tests/nodedescription_description.pl      |   16 +-
 .../nodedescription_description_no_use_nodes.pl    |   16 +-
 tp/t/results/html_tests/redirection_same_labels.pl |   32 +-
 tp/t/results/html_tests/ref_in_preformatted.pl     |    8 +-
 .../html_tests/sectioning_check_menu_structure.pl  |   12 +-
 tp/t/results/html_tests/shorttitlepage.pl          |   16 +-
 .../html_tests/spaces_in_line_break_in_verb_w.pl   |    8 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |  200 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |  200 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |  204 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |  200 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |  200 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |  200 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |  204 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |  204 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |  200 +-
 .../test_accents_sc_use_numeric_entity.pl          |  200 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   12 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   12 +-
 .../tex_expanded_in_caption_multiple_time.pl       |    4 +-
 tp/t/results/html_tests/text_css_info_in_init.pl   |   16 +-
 tp/t/results/html_tests/titles.pl                  |   16 +-
 .../html_tests/transliterated_names_conflicts.pl   |    4 +-
 tp/t/results/html_tests/uref_accented_letter.pl    |   12 +-
 .../html_tests/uref_accented_letter_ascii.pl       |   12 +-
 .../html_tests/uref_accented_letter_latin1.pl      |   12 +-
 tp/t/results/html_tests/utf8_default.pl            |    4 +-
 tp/t/results/html_tests/utf8_enable_encoding.pl    |    4 +-
 .../html_tests/utf8_enable_encoding_no_use_iso.pl  |    4 +-
 .../utf8_enable_encoding_use_numeric_entity.pl     |    4 +-
 tp/t/results/html_tests/utf8_use_numeric_entity.pl |    4 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl   |    4 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  102 +-
 .../htmlxref/htmlxref_no_urlprefix_first.pl        |    8 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  102 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  102 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  102 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  102 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  102 +-
 tp/t/results/include/cpp_lines.pl                  |   60 +-
 tp/t/results/include/value_expansion_in_include.pl |   48 +-
 tp/t/results/indices/def_syn_indices.pl            |   16 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   32 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   28 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  124 +-
 .../encoding_index_ascii_enable_encoding.pl        |  124 +-
 tp/t/results/indices/encoding_index_latin1.pl      |  108 +-
 .../encoding_index_latin1_enable_encoding.pl       |  108 +-
 tp/t/results/indices/encoding_index_utf8.pl        |  108 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |  108 +-
 .../indices/encoding_index_utf8_no_use_unicode.pl  |  108 +-
 tp/t/results/indices/explicit_sort_key.pl          |   48 +-
 tp/t/results/indices/ftable_vtable.pl              |    4 +-
 .../indices/ignored_sort_char_empty_entries.pl     |    4 +-
 tp/t/results/indices/image_lines_count.pl          |  Bin 5648 -> 5652 bytes
 tp/t/results/indices/image_text_lines_count.pl     |  Bin 6051 -> 6055 bytes
 tp/t/results/indices/index_entry_in_footnote.pl    |  Bin 7020 -> 7028 bytes
 .../index_entry_in_footnote_different_node_end.pl  |    8 +-
 .../indices/index_entry_in_footnote_sections.pl    |    6 +-
 .../index_entry_in_footnote_sections_separate.pl   |    6 +-
 .../indices/index_entry_in_footnote_separate.pl    |    8 +-
 tp/t/results/indices/index_special_region.pl       |   48 +-
 .../index_special_region_no_insertcopying.pl       |   48 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |   48 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |   48 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |   48 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |   48 +-
 .../index_special_region_titlepage_no_nodes.pl     |   48 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |   48 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |   20 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |    4 +-
 .../indices/same_index_entry_merged_indices.pl     |    4 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   24 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |   24 +-
 tp/t/results/indices/seealso_duplicate.pl          |   24 +-
 tp/t/results/indices/seeentry.pl                   |   16 +-
 tp/t/results/indices/sorted_subentries.pl          |   20 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   16 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   16 +-
 tp/t/results/indices/transparent_sort_chars.pl     |    8 +-
 tp/t/results/indices/w_lines_count.pl              |  Bin 9362 -> 9378 bytes
 tp/t/results/info_tests/anchor_and_spaces.pl       |   12 +-
 tp/t/results/info_tests/anchor_in_command.pl       |   20 +-
 tp/t/results/info_tests/before_node_and_section.pl |   24 +-
 tp/t/results/info_tests/center_flush.pl            |   12 +-
 .../info_tests/colons_in_index_entries_and_node.pl |   16 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |   16 +-
 tp/t/results/info_tests/del_quote_linebreaking.pl  |   36 +-
 tp/t/results/info_tests/direntry_dircategory.pl    |    8 +-
 .../direntry_dircategory_and_commands.pl           |    8 +-
 tp/t/results/info_tests/empty_arguments.pl         |   12 +-
 tp/t/results/info_tests/empty_caption.pl           |    4 +-
 .../end_of_line_command_in_node_lines.pl           |   38 +-
 tp/t/results/info_tests/error_in_footnote.pl       |   16 +-
 tp/t/results/info_tests/file_only_png.pl           |  Bin 3512 -> 3520 bytes
 tp/t/results/info_tests/float_long_captions.pl     |    8 +-
 tp/t/results/info_tests/image_and_punctuation.pl   |  Bin 7083 -> 7107 bytes
 .../info_tests/image_and_spaces_formatting.pl      |  100 +-
 tp/t/results/info_tests/image_extension.pl         |  Bin 4465 -> 4477 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      |  Bin 2995 -> 2999 bytes
 tp/t/results/info_tests/image_not_found.pl         |    4 +-
 tp/t/results/info_tests/image_quotes.pl            |  Bin 2586 -> 2590 bytes
 tp/t/results/info_tests/image_text_encoded.pl      |    4 +-
 .../info_tests/image_text_file_only_and_alt.pl     |  Bin 2710 -> 2714 bytes
 .../info_tests/invalid_node_name_no_warning.pl     |   66 +-
 .../info_tests/invalid_node_name_warning.pl        |   66 +-
 .../info_tests/multiline_image_and_align.pl        |   64 +-
 .../multitable_anchor_and_index_entry.pl           |   20 +-
 .../info_tests/nested_footnotes_separate.pl        |    8 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   20 +-
 tp/t/results/info_tests/note_in_strong.pl          |   24 +-
 .../info_tests/note_in_strong_end_of_line.pl       |    8 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |   20 +-
 .../info_tests/one_node_counted_elements.pl        |   10 +-
 tp/t/results/info_tests/pxref_test.pl              |   32 +-
 tp/t/results/info_tests/quote_node_names_info.pl   |  132 +-
 tp/t/results/info_tests/ref_tests.pl               |   64 +-
 .../similar_external_and_internal_node.pl          |   40 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |    4 +-
 tp/t/results/info_tests/test_index.pl              |   24 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   12 +-
 tp/t/results/info_tests/xref_quote_long_item.pl    |   26 +-
 tp/t/results/info_tests/xref_test.pl               |   44 +-
 .../init_files_tests/customize_special_element.pl  |    4 +-
 .../init_files_tests/customize_translations.pl     |   12 +-
 .../init_files_tests/documentation_examples.pl     |  114 +-
 .../documentation_examples_texi2html.pl            |  114 +-
 .../init_files_tests/modified_translation.pl       |   12 +-
 .../init_files_tests/sc_formatting_with_css.pl     |   12 +-
 ...est_format_single_footnote_in_inline_content.pl |   20 +-
 tp/t/results/invalid_nestings/accents.pl           |   28 +-
 tp/t/results/invalid_nestings/bad_style_nesting.pl |    4 +-
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |    4 +-
 .../invalid_nestings/cartouche_in_style_command.pl |    4 +-
 tp/t/results/invalid_nestings/center.pl            |   32 +-
 .../invalid_nestings/def_in_style_command.pl       |    4 +-
 .../invalid_nestings/enumerate_in_style_command.pl |    4 +-
 .../invalid_nestings/example_in_style_command.pl   |    4 +-
 .../invalid_nestings/float_in_style_command.pl     |    8 +-
 .../flushright_in_style_command.pl                 |    4 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |    8 +-
 .../invalid_nestings/heading_commands_in_center.pl |    4 +-
 .../heading_commands_in_documentlanguage.pl        |    4 +-
 .../heading_separator_in_accent_command.pl         |    8 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |    6 +-
 tp/t/results/invalid_nestings/in_errormsg.pl       |   22 +-
 tp/t/results/invalid_nestings/in_table.pl          |   28 +-
 tp/t/results/invalid_nestings/item_in_ref.pl       |    4 +-
 .../invalid_nestings/menu_in_style_command.pl      |    4 +-
 .../multitable_in_style_command.pl                 |    4 +-
 .../invalid_nestings/on_block_command_line.pl      |   24 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   32 +-
 .../invalid_nestings/on_index_entry_line.pl        |   12 +-
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   12 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |   22 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   12 +-
 .../results/invalid_nestings/on_subheading_line.pl |   12 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |    4 +-
 .../invalid_nestings/quotation_in_style_command.pl |    4 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   12 +-
 .../invalid_nestings/ref_to_top_in_anchor.pl       |   10 +-
 .../invalid_nestings/section_in_footnote.pl        |    4 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |    8 +-
 .../invalid_nestings/section_on_itemize_line.pl    |    8 +-
 .../invalid_nestings/section_on_multitable_line.pl |    4 +-
 .../style_not_closed_before_first_node.pl          |    4 +-
 .../style_not_closed_in_block_command.pl           |    4 +-
 .../style_not_closed_in_table_line.pl              |    4 +-
 .../style_not_closed_no_newline_root_commands.pl   |    8 +-
 .../style_not_closed_root_commands.pl              |    8 +-
 tp/t/results/invalid_nestings/table_in_code.pl     |    4 +-
 .../thischapter_in_footnote_in_evenfooting.pl      |   12 +-
 .../thischapter_in_math_in_evenfooting.pl          |    4 +-
 .../unclosed_verb_end_of_line_on_misc_line.pl      |    4 +-
 .../invalid_nestings/unclosed_verb_on_misc_line.pl |    4 +-
 .../unclosed_verb_on_section_line.pl               |    4 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |    4 +-
 tp/t/results/itemize/accent_argument.pl            |   12 +-
 tp/t/results/itemize/bad_enumerate_arguments.pl    |    4 +-
 tp/t/results/itemize/empty_accent_argument.pl      |    4 +-
 tp/t/results/itemize/itemize_in_example.pl         |    4 +-
 .../itemize/itemize_line_commands_with_brace.pl    |    8 +-
 tp/t/results/itemize/w_argument.pl                 |   12 +-
 tp/t/results/languages/command_translated.pl       |   12 +-
 tp/t/results/languages/documentlanguage.pl         |    6 +-
 tp/t/results/languages/documentlanguage_option.pl  |    6 +-
 tp/t/results/languages/documentlanguage_unknown.pl |    6 +-
 .../results/languages/multiple_documentlanguage.pl |   12 +-
 tp/t/results/languages/multiple_in_preamble.pl     |    8 +-
 .../languages/multiple_in_preamble_before_node.pl  |    8 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |   18 +-
 .../languages/multiple_lang_chapters_latex.pl      |   18 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |   18 +-
 tp/t/results/languages/unknown_language.pl         |   12 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |   10 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |   10 +-
 .../anchor_in_copying_insertcopying_chap.pl        |   16 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |   20 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |   16 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |   64 +-
 tp/t/results/latex_tests/backslash_math.pl         |    8 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   12 +-
 .../custom_heading_with_include_in_command.pl      |    4 +-
 tp/t/results/latex_tests/custom_headings.pl        |    4 +-
 .../latex_tests/custom_headings_and_comments.pl    |    4 +-
 .../latex_tests/error_in_sectioning_command.pl     |   20 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  114 +-
 tp/t/results/latex_tests/indices.pl                |   72 +-
 .../latex_tests/indices_disable_encoding.pl        |   72 +-
 .../informative_commands_in_top_node.pl            |    4 +-
 tp/t/results/latex_tests/node_before_top.pl        |    6 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |    4 +-
 .../titlepage_with_commands_classical.pl           |    4 +-
 .../latex_tests/top_no_sectioning_command.pl       |    6 +-
 tp/t/results/latex_tests/verb.pl                   |   16 +-
 tp/t/results/layout/no_monolithic.pl               |    4 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |    4 +-
 tp/t/results/linemacro/api_doc_with_linemacro.pl   |   80 +-
 tp/t/results/linemacro/brace_command_not_closed.pl |    4 +-
 .../linemacro/call_macro_in_linemacro_body.pl      |    8 +-
 .../linemacro/call_macro_in_linemacro_call.pl      |    4 +-
 .../linemacro/comment_at_end_of_linemacro_call.pl  |    4 +-
 .../results/linemacro/comment_in_linemacro_call.pl |    4 +-
 .../comment_in_one_argument_linemacro_call.pl      |    4 +-
 .../linemacro/newline_and_continuation_in_brace.pl |   10 +-
 tp/t/results/linemacro/paragraph_no_paragraph.pl   |   12 +-
 .../linemacro/spaces_after_command_in_call.pl      |   12 +-
 ...paces_after_macro_linemacro_commands_in_call.pl |   10 +-
 .../spaces_after_unknown_command_in_call.pl        |    4 +-
 tp/t/results/linemacro/text_arguments.pl           |    8 +-
 tp/t/results/linemacro/verb_in_linemacro_call.pl   |    8 +-
 tp/t/results/linemacro/verb_not_closed.pl          |    4 +-
 .../verb_with_arobase_in_linemacro_call.pl         |    4 +-
 .../linemacro/verb_with_brace_in_linemacro_call.pl |    4 +-
 tp/t/results/macro/bib_example.pl                  |   32 +-
 ...losing_brace_in_macro_call_in_ignored_inline.pl |    8 +-
 tp/t/results/macro/complex_argument.pl             |    8 +-
 .../macro/cpp_directives_line_value_macro.pl       |    6 +-
 tp/t/results/macro/expand_two_same.pl              |    8 +-
 tp/t/results/macro/glossary.pl                     |   16 +-
 tp/t/results/macro/ignored_macro_definition.pl     |    4 +-
 tp/t/results/macro/implicit_quoting_one_arg.pl     |    4 +-
 tp/t/results/macro/include_after_empty_line_arg.pl |    4 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |   24 +-
 .../macro/macro_call_in_ignored_inlinefmtifelse.pl |    4 +-
 .../macro/macro_call_in_inlinefmtifelse_format.pl  |    4 +-
 tp/t/results/macro/macro_call_in_node_manual.pl    |    4 +-
 .../macro/macro_end_call_in_ignored_inlinefmt.pl   |    4 +-
 .../macro_end_call_in_ignored_inlinefmtifelse.pl   |    4 +-
 ...cro_end_call_in_ignored_inlinefmtifelse_else.pl |    4 +-
 .../macro/macro_end_call_in_ignored_inlineraw.pl   |    4 +-
 tp/t/results/macro/macro_expansion.pl              |    4 +-
 .../macro_expansion_in_multitable_prototype.pl     |    8 +-
 tp/t/results/macro/macro_for_verb.pl               |    4 +-
 tp/t/results/macro/macro_in_accent.pl              |   20 +-
 tp/t/results/macro/macro_in_brace_command.pl       |    4 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   16 +-
 .../macro/macro_in_menu_comment_like_entry.pl      |    4 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |   28 +-
 .../macro_inlineifcond_end_in_empty_ignored.pl     |    8 +-
 .../macro/macro_inlineifcond_end_in_empty_set.pl   |    8 +-
 tp/t/results/macro/macro_name_with_hyphen.pl       |    4 +-
 .../macro/macro_replaced_by_definfoenclose.pl      |    4 +-
 tp/t/results/macro/protect_in_body.pl              |   12 +-
 tp/t/results/macro/protect_in_body_line_arg.pl     |   12 +-
 tp/t/results/macro/protect_in_body_one_arg.pl      |   12 +-
 tp/t/results/macro/redefine_texinfo_macro.pl       |    4 +-
 .../macro/verb_with_arobase_in_macro_call.pl       |    8 +-
 .../results/macro/verb_with_brace_in_macro_call.pl |    4 +-
 tp/t/results/menu/bad_beginning.pl                 |    4 +-
 .../menu/commands_in_nodedescriptionblock.pl       |   50 +-
 tp/t/results/menu/formats_in_menu.pl               |    4 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |    4 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   20 +-
 tp/t/results/menu/menu_entry_no_entry.pl           |    8 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |    4 +-
 tp/t/results/menu/nodedescription_descriptions.pl  |   16 +-
 .../menu/nodedescriptionblock_descriptions.pl      |   16 +-
 tp/t/results/menu/sc_in_menu.pl                    |   52 +-
 tp/t/results/menu/verb_in_menu_description.pl      |    4 +-
 tp/t/results/misc_commands/clickstyle.pl           |    8 +-
 .../codequoteundirected_codequotebacktick.pl       |  396 +--
 .../misc_commands/command_in_heading_footing.pl    |    4 +-
 .../command_not_closed_in_documentencoding.pl      |   11 +-
 .../command_not_closed_on_center_line.pl           |    4 +-
 tp/t/results/misc_commands/definfoenclose.pl       |   16 +-
 .../misc_commands/definfoenclose_nestings.pl       |   20 +-
 .../misc_commands/definfoenclose_with_empty_arg.pl |    4 +-
 .../results/misc_commands/empty_center_with_arg.pl |    4 +-
 tp/t/results/misc_commands/footnote_in_center.pl   |    6 +-
 .../misc_commands/heading_command_in_commands.pl   |    4 +-
 .../incorrect_allowcodebreaks_argument.pl          |    4 +-
 .../indent_in_command_in_paragraph.pl              |   12 +-
 .../indent_with_command_after_without_space.pl     |    4 +-
 .../indent_with_text_after_without_space.pl        |    6 +-
 tp/t/results/misc_commands/invalid_clickstyle.pl   |   12 +-
 .../misc_commands/invalid_documentencoding.pl      |   16 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |  192 +-
 .../misc_commands/kbdinputstyle_in_table.pl        |   24 +-
 tp/t/results/misc_commands/nodedescription.pl      |    4 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   10 +-
 tp/t/results/misc_commands/setfilename.pl          |    4 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  248 +-
 tp/t/results/moresectioning/anchor_in_footnote.pl  |   14 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |   14 +-
 .../anchor_in_footnote_separate_split_node.pl      |   14 +-
 .../anchor_in_footnote_split_node.pl               |   14 +-
 .../moresectioning/character_and_spaces_in_refs.pl |   56 +-
 .../character_and_spaces_in_refs_out.pl            |   56 +-
 .../equivalent_nodes_defined_linked.pl             |   28 +-
 tp/t/results/moresectioning/no_element.pl          |   36 +-
 .../moresectioning/nodes_before_after_top_xref.pl  |   24 +-
 ...nodes_no_section_footnote_no_top_node_output.pl |    4 +-
 .../non_automatic_internal_top_node_up.pl          |   24 +-
 .../non_automatic_top_node_up_and_url.pl           |   24 +-
 .../moresectioning/placed_things_before_element.pl |   48 +-
 .../placed_things_before_element_no_use_node.pl    |   48 +-
 .../moresectioning/placed_things_before_node.pl    |   48 +-
 .../moresectioning/special_spaces_in_nodes.pl      |    6 +-
 tp/t/results/multitable/empty_headitem.pl          |    8 +-
 tp/t/results/multitable/prototype_no_brace.pl      |    4 +-
 tp/t/results/multitable/ref_in_multitable.pl       |   40 +-
 tp/t/results/multitable/w_in_multitable.pl         |    4 +-
 tp/t/results/paragraph/close_paragraph_command.pl  |    4 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |    4 +-
 tp/t/results/paragraph/double_style_paragraph.pl   |    8 +-
 tp/t/results/paragraph/image_in_paragraph.pl       |    4 +-
 .../indent_before_macro_definition_and_other.pl    |    8 +-
 tp/t/results/paragraph/no_paragraph_commands.pl    |    8 +-
 tp/t/results/paragraph/paragraph_command.pl        |   24 +-
 .../paragraph/paragraph_in_style_command.pl        |    8 +-
 tp/t/results/paragraph/sole_image.pl               |    4 +-
 .../plaintext_tests/U_with_utf8_enable_encoding.pl |    4 +-
 .../plaintext_tests/accent_command_punctuation.pl  |    4 +-
 .../accents_in_var_enable_encoding.pl              |   16 +-
 .../after_punctuation_character_in_command.pl      |    4 +-
 .../plaintext_tests/anchor_and_empty_lines.pl      |    4 +-
 .../at_commands_glued_in_example.pl                |   42 +-
 .../at_commands_glued_in_paragraph.pl              |   42 +-
 .../plaintext_tests/before_accent_punctuation.pl   |    4 +-
 .../characters_and_commands_in_var.pl              |   48 +-
 .../code_commands_and_punctuation.pl               |    8 +-
 .../command_brace_no_arg_punctuation.pl            |   16 +-
 .../plaintext_tests/commands_and_punctuation.pl    |    8 +-
 tp/t/results/plaintext_tests/east_asian_in_w.pl    |    4 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |   12 +-
 .../plaintext_tests/lone_braces_in_inlineraw.pl    |    4 +-
 .../plaintext_tests/long_uref_after_item.pl        |    4 +-
 .../plaintext_tests/multiline_image_and_align.pl   |   32 +-
 .../plaintext_tests/multiline_verb_after_space.pl  |    4 +-
 .../plaintext_tests/nested_code_commands.pl        |  188 +-
 .../plaintext_tests/no_empty_line_after_section.pl |    4 +-
 .../plaintext_tests/protect_spaces_on_line.pl      |   16 +-
 .../plaintext_tests/punctuation_abbr_acronym.pl    |   32 +-
 .../punctuation_and_code_style_commands.pl         |   60 +-
 .../punctuation_and_code_style_commands_utf8.pl    |   60 +-
 .../plaintext_tests/punctuation_and_footnotes.pl   |   48 +-
 .../punctuation_and_footnotes_frenchspacing.pl     |   48 +-
 .../punctuation_and_upper_case_commands.pl         |  120 +-
 .../punctuation_and_upper_case_commands_utf8.pl    |  120 +-
 .../plaintext_tests/punctuation_at_end_command.pl  |   40 +-
 .../plaintext_tests/punctuation_commands.pl        |   16 +-
 .../punctuation_commands_frenchspacing.pl          |   16 +-
 .../plaintext_tests/punctuation_in_command.pl      |   36 +-
 .../punctuation_in_command_end_line.pl             |   40 +-
 tp/t/results/plaintext_tests/punctuation_in_sc.pl  |    8 +-
 .../punctuation_sc_accents_ascii_glyph.pl          |  200 +-
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |  200 +-
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |  204 +-
 .../punctuation_sc_accents_default.pl              |  200 +-
 .../punctuation_sc_accents_default_latin1.pl       |  200 +-
 .../punctuation_sc_accents_default_usascii.pl      |  204 +-
 .../punctuation_sc_accents_disable_encoding.pl     |  200 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |  200 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |  204 +-
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |  200 +-
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |  204 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |  200 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |  204 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  132 +-
 .../sc_with_utf8_enable_encoding.pl                |    4 +-
 .../split_punctuation_detection_in_commands.pl     |   20 +-
 .../plaintext_tests/star_at_command_formatting.pl  |   48 +-
 tp/t/results/plaintext_tests/transparent_text.pl   |    8 +-
 tp/t/results/preformatted/caption_in_example.pl    |    4 +-
 .../preformatted/empty_line_style_command.pl       |    4 +-
 .../preformatted/example_at_commands_arguments.pl  |   24 +-
 .../example_invalid_at_commands_arguments.pl       |   10 +-
 tp/t/results/preformatted/titlefont_in_example.pl  |    4 +-
 tp/t/results/quotation/empty_quotation.pl          |    4 +-
 .../quotation/footnote_in_quotation_with_arg.pl    |    4 +-
 ...pty_line_in_command_in_expanded_not_expanded.pl |    8 +-
 tp/t/results/raw/inline_in_example.pl              |   20 +-
 tp/t/results/raw/inline_missing_first_arg.pl       |    8 +-
 tp/t/results/raw/inlinefmt.pl                      |   16 +-
 tp/t/results/raw/inlinefmt_with_empty_line.pl      |   16 +-
 tp/t/results/raw/inlineraw.pl                      |   16 +-
 tp/t/results/raw/inlineraw_not_closed.pl           |    4 +-
 tp/t/results/raw/inlineraw_with_empty_line.pl      |   16 +-
 tp/t/results/raw/raw_expanded_in_style.pl          |    4 +-
 tp/t/results/raw/raw_in_style.pl                   |    4 +-
 .../raw/second_level_lone_braces_in_html.pl        |    8 +-
 tp/t/results/raw/verbatim_in_brace_command.pl      |    4 +-
 tp/t/results/regions/anchor_in_copying.pl          |   10 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   14 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |   10 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   10 +-
 tp/t/results/regions/ref_in_copying.pl             |    6 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |    6 +-
 tp/t/results/regions/today_in_copying.pl           |    4 +-
 tp/t/results/sectioning/anchor_zero.pl             |   10 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |   40 +-
 .../results/sectioning/double_node_anchor_float.pl |    8 +-
 ...double_recursive_self_section_node_reference.pl |   12 +-
 ...sive_self_section_node_reference_no_use_node.pl |   12 +-
 .../double_recursive_self_section_reference.pl     |   12 +-
 tp/t/results/sectioning/double_top.pl              |    4 +-
 tp/t/results/sectioning/email_in_node.pl           |   12 +-
 tp/t/results/sectioning/empty_anchor.pl            |    8 +-
 .../sectioning/empty_nodes_with_commands.pl        |    4 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   24 +-
 tp/t/results/sectioning/empty_refs.pl              |   16 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   12 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   18 +-
 .../sectioning/equivalent_nodes_novalidate.pl      |   18 +-
 .../results/sectioning/no_argument_and_contents.pl |    4 +-
 tp/t/results/sectioning/node_line_arguments.pl     |   12 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |    8 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |    6 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |   18 +-
 tp/t/results/sectioning/novalidate.pl              |    6 +-
 .../one_node_explicit_directions_anchor.pl         |   10 +-
 ..._node_explicit_directions_anchor_no_use_node.pl |   10 +-
 .../sectioning/protected_node_parentheses.pl       |   28 +-
 .../sectioning/recursive_self_section_reference.pl |    6 +-
 tp/t/results/sectioning/ref_to_top.pl              |    6 +-
 tp/t/results/sectioning/ref_to_unknown_node.pl     |    6 +-
 .../reference_to_only_special_spaces_node.pl       |   28 +-
 .../transliterated_split_equivalent_nodes.pl       |   20 +-
 .../sectioning/unnumbered_before_top_node.pl       |    4 +-
 .../insert_nodes_for_sectioning_commands.pl        |   26 +-
 .../transformations/protect_colon_source_mark.pl   |    6 +-
 .../transformations/protect_comma_source_mark.pl   |   36 +-
 ...st_parenthesis_after_parenthesis_source_mark.pl |   10 +-
 .../protect_first_parenthesis_source_mark.pl       |   10 +-
 ...otect_hashchar_at_line_beginning_source_mark.pl |   26 +-
 ...ct_node_after_label_source_mark_in_protected.pl |   18 +-
 tp/t/results/value/bad_syntax.pl                   |    6 +-
 .../value/begin_like_comment_on_set_line.pl        |   12 +-
 .../closing_brace_in_value_in_ignored_inline.pl    |   14 +-
 tp/t/results/value/comment_on_clear_line.pl        |   24 +-
 tp/t/results/value/comment_on_set_line.pl          |   24 +-
 tp/t/results/value/empty_set.pl                    |    6 +-
 tp/t/results/value/empty_value_in_line.pl          |    6 +-
 tp/t/results/value/ignored_value_definition.pl     |   10 +-
 tp/t/results/value/not_only_characters.pl          |    6 +-
 tp/t/results/value/recursive_expansion_in_set.pl   |  600 ++---
 tp/t/results/value/set_flag_command_equivalent.pl  |    6 +-
 tp/t/results/value/set_form_feed.pl                |   22 +-
 tp/t/results/value/simple.pl                       |   10 +-
 tp/t/results/value/spaces_before_value.pl          |    4 +-
 tp/t/results/value/unknown_value_after_spaces.pl   |    6 +-
 tp/t/results/value/value_after_accent.pl           |   20 +-
 tp/t/results/value/value_after_brace_command.pl    |   48 +-
 tp/t/results/value/value_in_index_commands.pl      |   82 +-
 .../value/value_in_invalid_documentencoding.pl     |    6 +-
 tp/t/results/value/value_in_misc_commands.pl       |  286 +--
 tp/t/results/value/value_in_node.pl                |   30 +-
 tp/t/results/value/value_node_directions.pl        |   30 +-
 tp/t/results/value/value_zero.pl                   |    6 +-
 .../value_and_macro/comma_value_in_macro_arg.pl    |   14 +-
 tp/t/results/value_and_macro/macro_in_value.pl     |    6 +-
 .../results/value_and_macro/value_in_macro_body.pl |   10 +-
 tp/t/results/verb/comments.pl                      |    8 +-
 tp/t/results/verb/end_of_line.pl                   |    4 +-
 tp/t/results/verb/multiline.pl                     |    4 +-
 tp/t/results/verb/nested.pl                        |    8 +-
 tp/t/results/verb/simple.pl                        |    4 +-
 .../verb/verb_and_char_end_of_line_not_closed.pl   |    4 +-
 .../results/verb/verb_at_end_of_line_not_closed.pl |    4 +-
 tp/t/results/verb/verb_not_closed.pl               |    4 +-
 tp/t/results/verb/verb_not_closed_with_char.pl     |    4 +-
 .../brace_commands_spaces_end_of_lines.pl          |   24 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   32 +-
 .../xml_tests/comments_on_block_command_lines.pl   |    8 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  108 +-
 tp/t/results/xml_tests/inline_commands.pl          |   32 +-
 .../xml_tests/inlineifset_empty_second_arg.pl      |    8 +-
 tp/t/results/xtable/accent_on_table_line.pl        |   20 +-
 812 files changed, 18440 insertions(+), 18212 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3821995d75..650953b054 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,89 @@
+2024-11-11  Patrice Dumas  <pertusus@free.fr>
+
+       Use contents instead of args for brace commands in Texinfo tree
+
+       * tp/Texinfo/ParserNonXS.pm (_handle_comma): rename $brace_command as
+       $command_element.
+
+       * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/ParserNonXS.pm
+       (_end_line_starting_block, _new_value_element, _handle_open_brace)
+       (_handle_close_brace, _handle_comma, _process_remaining_on_line),
+       tp/Texinfo/Translations.pm (_substitute_element_array),
+       tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
+       tp/Texinfo/XS/main/translations.c (substitute_element_array),
+       tp/Texinfo/XS/main/utils.c (get_label_element),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
+       tp/Texinfo/XS/parsetexi/parser.c (new_value_element)
+       (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
+       (handle_open_brace, handle_close_brace, handle_comma): use contents
+       instead of args for brace command arguments in Texinfo tree.
+
+       * tp/Texinfo/Structuring.pm (check_nodes_are_referenced),
+       tp/Texinfo/Transformations.pm (fill_gaps_in_sectioning)
+       (_reference_to_arg, _protect_hashchar_at_line_beginning),
+       tp/Texinfo/ManipulateTree.pm (_new_asis_command_with_text)
+       (_protect_text, protect_first_parenthesis),
+       tp/Texinfo/XS/main/manipulate_tree.c (new_asis_command_with_text)
+       (protect_text), tp/Texinfo/XS/structuring_transfo/structuring.c
+       (check_nodes_are_referenced, associate_internal_references),
+       tp/Texinfo/XS/structuring_transfo/transformations.c
+       (protect_first_parenthesis, fill_gaps_in_sectioning)
+       (reference_to_arg_internal)
+       (protect_hashchar_at_line_beginning_internal): update structuring and
+       transformations for change of args to contents for brace commands.
+
+       * tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
+       tp/Texinfo/Convert/DocBook.pm (conversion_output_begin, _index_entry)
+       (_convert), tp/Texinfo/Convert/HTML.pm (_internal_command_tree)
+       (_convert_explained_command, _convert_listoffloats_command)
+       (_convert_float_command, _convert_xref_commands)
+       (_convert_printindex_command, _default_format_single_footnote)
+       (_prepare_converted_output_info, _convert), tp/Texinfo/Convert/Info.pm
+       (format_ref, format_image), tp/Texinfo/Convert/LaTeX.pm (_title)
+       (_begin_document, _index_entry, _convert),
+       tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+       tp/Texinfo/Convert/Plaintext.pm (%ignored_commands, process_footnotes)
+       (process_printindex, format_ref, image_formatted_text, format_image)
+       (_convert), tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
+       (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
+       (_convert), tp/Texinfo/Convert/Text.pm (_convert),
+       tp/Texinfo/Convert/Utils.pm (definition_category_tree)
+       (find_innermost_accent_contents), tp/Texinfo/Indices.pm
+       (_idx_leading_text_or_command), tp/Texinfo/ManipulateTree.pm
+       (_new_asis_command_with_text, _protect_text)
+       (protect_first_parenthesis), tp/Texinfo/XS/convert/convert_html.c
+       (html_prepare_converted_output_info, html_convert_tree_append)
+       (html_node_redirections), tp/Texinfo/XS/convert/converter.c
+       (table_item_content_tree), tp/Texinfo/XS/convert/format_html.c
+       (html_internal_command_tree, html_default_format_single_footnote)
+       (html_convert_explained_command, html_convert_xref_command)
+       (html_convert_float_command, html_convert_listoffloats_command)
+       (html_convert_printindex_command),
+       tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+       (convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
+       (convert_to_text_internal), tp/Texinfo/XS/main/convert_utils.c
+       (find_innermost_accent_contents),
+       tp/Texinfo/XS/main/manipulate_indices.c (idx_leading_text_or_command),
+       tp/Texinfo/XS/main/node_name_normalization.c
+       (convert_to_normalized_internal), tp/ext/latex2html.pm (l2h_process),
+       tp/ext/tex4ht.pm (tex4ht_prepare): update conversion for change of
+       args to contents for brace commands.  call get_label_element more.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert),
+       tp/Texinfo/Convert/LaTeX.pm (_convert),
+       tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+       tp/Texinfo/XS/main/node_name_normalization.c
+       (convert_to_normalized_internal): return right after formatting brace
+       commands.
+
+       * tp/init/documentation_examples.pm
+       (my_test_documentation_convert_xref_commands), tp/t/01use.t,
+       tp/t/init/footnote_mark_in_inline_content.pm
+       (_texi2any_test_format_single_footnote_in_inline_content): update 
+       tests init files and manually written tree.
+
+       * tp/t/09indices.t: change code order.
+
 2024-11-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 5f87a87f6b..51f42ea791 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1726,9 +1726,12 @@ sub get_label_element($)
 {
   my $current = shift;
   return undef if (!defined($current->{'cmdname'}));
-  if (($current->{'cmdname'} eq 'node' or $current->{'cmdname'} eq 'anchor')
+  if ($current->{'cmdname'} eq 'node'
       and $current->{'args'} and scalar(@{$current->{'args'}})) {
     return $current->{'args'}->[0];
+  } elsif ($current->{'cmdname'} eq 'anchor'
+           and $current->{'contents'} and scalar(@{$current->{'contents'}})) {
+    return $current->{'contents'}->[0];
   } elsif ($current->{'cmdname'} eq 'float'
       and $current->{'args'} and scalar(@{$current->{'args'}}) >= 2) {
     return $current->{'args'}->[1];
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a57fc4fa36..840366b91d 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1547,7 +1547,7 @@ sub table_item_content_tree($$)
               'contents' => [$element->{'args'}->[0]],
               'parent' => $command,};
     }
-    $command->{'args'} = [$arg];
+    $command->{'contents'} = [$arg];
     return $command;
   }
   return undef;
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 21ed7fc321..b4ca450317 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -410,7 +410,7 @@ sub conversion_output_begin($;$$)
 
   my $fulltitle_command;
   if ($global_commands) {
-    foreach my $title_cmdname ('title', 'shorttitlepage', 'titlefont') {
+    foreach my $title_cmdname ('title', 'shorttitlepage') {
       if ($global_commands->{$title_cmdname}) {
         my $command = $global_commands->{$title_cmdname};
         next if (!$command->{'args'}
@@ -419,6 +419,13 @@ sub conversion_output_begin($;$$)
         last;
       }
     }
+    if (!defined($fulltitle_command)) {
+      my $command = $global_commands->{'titlefont'};
+      if ($command and $command->{'contents'}
+          and $command->{'contents'}->[0]->{'contents'}) {
+        $fulltitle_command = $command;
+      }
+    }
   }
 
   # get informations from the @titlepage.  Since the fulltitle is gathered
@@ -648,13 +655,13 @@ sub _index_entry($$)
       $result .= "<see>";
       # args is set as the extra information is added when closing braces
       $result .= _convert($self, $index_entry->{'entry_element'}
-                                   ->{'extra'}->{'seeentry'}->{'args'}->[0]);
+                               ->{'extra'}->{'seeentry'}->{'contents'}->[0]);
       $result .= "</see>";
     }
     if ($index_entry->{'entry_element'}->{'extra'}->{'seealso'}) {
       $result .= "<seealso>";
       $result .= _convert($self, $index_entry->{'entry_element'}
-                               ->{'extra'}->{'seealso'}->{'args'}->[0]);
+                           ->{'extra'}->{'seealso'}->{'contents'}->[0]);
       $result .= "</seealso>";
     }
 
@@ -1106,14 +1113,15 @@ sub _convert($$;$)
       }
     } elsif ($element->{'type'}
              and $element->{'type'} eq 'definfoenclose_command') {
-      if ($element->{'args'}) {
-        my $arg_text = _convert($self, $element->{'args'}->[0]);
+      if ($element->{'contents'}) {
+        my $arg_text = _convert($self, $element->{'contents'}->[0]);
         $result .= $arg_text;
       }
+      return $result;
 
-    } elsif ($element->{'args'}
+    } elsif ($element->{'contents'}
              and exists($Texinfo::Commands::brace_commands{$cmdname})) {
-      #Texinfo::Common::debug_list(" brace command with args", 
$element->{'args'});
+      #Texinfo::Common::debug_list(" brace command with args", 
$element->{'contents'});
       if ($style_commands_formatting{$cmdname}) {
         if ($Texinfo::Commands::brace_commands{$cmdname} eq 'context') {
           _new_document_context($self);
@@ -1140,7 +1148,7 @@ sub _convert($$;$)
 
         my ($style, $attribute_text)
            = _parse_attribute($formatting->{'attribute'});
-        my $result = _convert($self, $element->{'args'}->[0]);
+        my $result = _convert($self, $element->{'contents'}->[0]);
         if ($style ne '' and (!$self->{'document_context'}->[-1]->{'inline'}
                                or $inline_elements{$style})) {
           $result = "<$style${attribute_text}>$result</$style>";
@@ -1170,8 +1178,8 @@ sub _convert($$;$)
       } elsif ($cmdname eq 'anchor') {
         return _output_anchor($element);
       } elsif ($Texinfo::Commands::ref_commands{$cmdname}) {
-        if ($element->{'args'}) {
-          my $args_nr = scalar(@{$element->{'args'}});
+        if ($element->{'contents'}) {
+          my $args_nr = scalar(@{$element->{'contents'}});
           my $command_name;
           my $book_element;
           my ($section_name, $node_name);
@@ -1184,27 +1192,27 @@ sub _convert($$;$)
             $command_name = 'ref';
           } else {
             if ($args_nr >= 5
-                and $element->{'args'}->[4]->{'contents'}) {
-              $book_element = $element->{'args'}->[4];
+                and $element->{'contents'}->[4]->{'contents'}) {
+              $book_element = $element->{'contents'}->[4];
             }
             if ($args_nr >= 3
-                and $element->{'args'}->[2]->{'contents'}) {
-              my $section_arg = $element->{'args'}->[2];
+                and $element->{'contents'}->[2]->{'contents'}) {
+              my $section_arg = $element->{'contents'}->[2];
               $section_name = _convert($self, $section_arg);
             }
             $command_name = $cmdname;
           }
           my $manual_file_element;
           if ($args_nr >= $manual_file_index+1
-              and $element->{'args'}->[$manual_file_index]->{'contents'}) {
-            $manual_file_element = $element->{'args'}->[$manual_file_index];
+              and $element->{'contents'}->[$manual_file_index]->{'contents'}) {
+            $manual_file_element = 
$element->{'contents'}->[$manual_file_index];
           }
           if (! defined($section_name) and $args_nr >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            my $section_arg = $element->{'args'}->[1];
+              and $element->{'contents'}->[1]->{'contents'}) {
+            my $section_arg = $element->{'contents'}->[1];
             $section_name = _convert($self, $section_arg);
-          } elsif ($element->{'args'}->[0]->{'contents'}) {
-            my $node_arg = $element->{'args'}->[0];
+          } elsif ($element->{'contents'}->[0]->{'contents'}) {
+            my $node_arg = $element->{'contents'}->[0];
             push @{$self->{'document_context'}->[-1]->{'upper_case'}}, 0;
             $node_name = _convert($self, $node_arg);
             pop @{$self->{'document_context'}->[-1]->{'upper_case'}};
@@ -1330,7 +1338,7 @@ sub _convert($$;$)
             $result = '';
           } else {
             my $linkend = '';
-            my $node_arg = $element->{'args'}->[0];
+            my $node_arg = $element->{'contents'}->[0];
             if ($node_arg and $node_arg->{'extra'}
                 and defined($node_arg->{'extra'}->{'normalized'})
                 and !$node_arg->{'extra'}->{'manual_content'}) {
@@ -1363,14 +1371,14 @@ sub _convert($$;$)
           return '';
         }
       } elsif ($cmdname eq 'image') {
-        if ($element->{'args'}
-            and $element->{'args'}->[0]->{'contents'}) {
+        if ($element->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}) {
           Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
           Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
                                   $self->{'convert_text_options'});
           my $basefile = Texinfo::Convert::Text::convert_to_text(
-                                        $element->{'args'}->[0],
+                                        $element->{'contents'}->[0],
                                     $self->{'convert_text_options'});
           Texinfo::Convert::Text::reset_options_code(
                                  $self->{'convert_text_options'});
@@ -1422,17 +1430,18 @@ sub _convert($$;$)
             $result .= "</mediaobject></informalfigure>";
           }
         }
+        return $result;
       } elsif ($cmdname eq 'email') {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           my $name;
           my $email;
           my $email_text;
-          if (scalar(@{$element->{'args'}}) >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            $name = $element->{'args'}->[1];
+          if (scalar(@{$element->{'contents'}}) >= 2
+              and $element->{'contents'}->[1]->{'contents'}) {
+            $name = $element->{'contents'}->[1];
           }
-          if ($element->{'args'}->[0]->{'contents'}) {
-            $email = $element->{'args'}->[0];
+          if ($element->{'contents'}->[0]->{'contents'}) {
+            $email = $element->{'contents'}->[0];
             Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
             Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
@@ -1462,11 +1471,11 @@ sub _convert($$;$)
         }
 
       } elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
-        if ($element->{'args'}) {
-          my $args_nr = scalar(@{$element->{'args'}});
+        if ($element->{'contents'}) {
+          my $args_nr = scalar(@{$element->{'contents'}});
           my ($url_text, $url_arg);
-          if ($element->{'args'}->[0]->{'contents'}) {
-            $url_arg = $element->{'args'}->[0];
+          if ($element->{'contents'}->[0]->{'contents'}) {
+            $url_arg = $element->{'contents'}->[0];
             Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
             Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
@@ -1483,13 +1492,13 @@ sub _convert($$;$)
           }
           my $replacement;
           if ($args_nr >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            $replacement = _convert($self, $element->{'args'}->[1]);
+              and $element->{'contents'}->[1]->{'contents'}) {
+            $replacement = _convert($self, $element->{'contents'}->[1]);
           }
           if (!defined($replacement) or $replacement eq '') {
             if ($args_nr >= 3
-                and $element->{'args'}->[2]->{'contents'}) {
-              $replacement = _convert($self, $element->{'args'}->[2]);
+                and $element->{'contents'}->[2]->{'contents'}) {
+              $replacement = _convert($self, $element->{'contents'}->[2]);
             }
           }
           if (!defined($replacement) or $replacement eq '') {
@@ -1503,10 +1512,10 @@ sub _convert($$;$)
         }
 
       } elsif ($cmdname eq 'abbr' or $cmdname eq 'acronym') {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           my $argument;
-          if ($element->{'args'}->[0]->{'contents'}) {
-            my $arg_text = _convert($self, $element->{'args'}->[0]);
+          if ($element->{'contents'}->[0]->{'contents'}) {
+            my $arg_text = _convert($self, $element->{'contents'}->[0]);
             if ($arg_text ne '') {
               my $format_element;
               if ($cmdname eq 'abbr') {
@@ -1517,17 +1526,17 @@ sub _convert($$;$)
               $argument = "<$format_element>$arg_text</$format_element>";
             }
           }
-          if (scalar(@{$element->{'args'}}) >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
+          if (scalar(@{$element->{'contents'}}) >= 2
+              and $element->{'contents'}->[1]->{'contents'}) {
             if (defined($argument)) {
               my $tree = $self->cdt('{abbr_or_acronym} ({explanation})',
                              {'abbr_or_acronym' => {'type' => '_converted',
                                                     'text' => $argument},
                               'explanation' =>
-                                  $element->{'args'}->[1]});
+                                  $element->{'contents'}->[1]});
               return _convert($self, $tree);
             } else {
-              return _convert($self, $element->{'args'}->[1]);
+              return _convert($self, $element->{'contents'}->[1]);
             }
           } elsif (defined($argument)) {
             return $argument;
@@ -1536,10 +1545,11 @@ sub _convert($$;$)
         return '';
 
       } elsif ($cmdname eq 'U') {
-        if ($element->{'args'}
-            and $element->{'args'}->[0]->{'contents'}
-            and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
-          my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+        if ($element->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+          my $arg_text
+            = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
 
           if (defined($arg_text)) {
             my $result = "&#x$arg_text;";
@@ -1567,9 +1577,9 @@ sub _convert($$;$)
                  and ! 
$self->{'expanded_formats'}->{$element->{'extra'}->{'format'}}) {
           $arg_index = 2;
         }
-        if (scalar(@{$element->{'args'}}) > $arg_index
-            and $element->{'args'}->[$arg_index]->{'contents'}) {
-          $result .= _convert($self, $element->{'args'}->[$arg_index]);
+        if (scalar(@{$element->{'contents'}}) > $arg_index
+            and $element->{'contents'}->[$arg_index]->{'contents'}) {
+          $result .= _convert($self, $element->{'contents'}->[$arg_index]);
         }
         if ($cmdname eq 'inlineraw') {
           pop @{$self->{'document_context'}};
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ce3dbbf43b..c125e47f9c 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1280,8 +1280,14 @@ sub _internal_command_tree($$$)
                     or $command->{'cmdname'} eq 'anchor')) {
         # to be a target, the node or anchor cannot be empty (nor expand to
         # spaces only), so argument is necessarily set.
+        my $label_element;
+        if ($command->{'cmdname'} eq 'anchor') {
+          $label_element = $command->{'contents'}->[0];
+        } else {
+          $label_element = $command->{'args'}->[0];
+        }
         $tree = {'type' => '_code',
-                 'contents' => [$command->{'args'}->[0]]};
+                 'contents' => [$label_element]};
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
         $tree = $self->float_type_number($command);
       } elsif (!$command->{'args'}->[0]
@@ -3317,11 +3323,11 @@ sub _convert_explained_command($$$$)
   my $explanation_string;
   my $normalized_type = '';
 
-  if ($command->{'args'}
-      and $command->{'args'}->[0]->{'contents'}) {
+  if ($command->{'contents'}
+      and $command->{'contents'}->[0]->{'contents'}) {
     $normalized_type
        = Texinfo::Convert::NodeNameNormalization::convert_to_identifier(
-                                   $command->{'args'}->[0]);
+                                   $command->{'contents'}->[0]);
   }
 
   if ($args and $args->[1] and defined($args->[1]->{'string'})
@@ -5277,7 +5283,7 @@ sub _convert_listoffloats_command($$$$)
           $multiple_formatted .= '-'.($formatted_listoffloats_nr - 1);
         }
         $caption_text = $self->convert_tree_new_formatting_context(
-          $caption_element->{'args'}->[0], $cmdname, $multiple_formatted);
+          $caption_element->{'contents'}->[0], $cmdname, $multiple_formatted);
         push @caption_classes, "${caption_cmdname}-in-${cmdname}";
       } else {
         $caption_text = '';
@@ -5351,10 +5357,10 @@ sub _convert_float_command($$$$$)
       $prepended_text = '';
     }
     my $caption_text = '';
-    if ($caption_element and $caption_element->{'args'}->[0]
-        and $caption_element->{'args'}->[0]->{'contents'}) {
+    if ($caption_element and $caption_element->{'contents'}->[0]
+        and $caption_element->{'contents'}->[0]->{'contents'}) {
       $caption_text = $self->convert_tree_new_formatting_context(
-                         $caption_element->{'args'}->[0], 'float caption');
+                         $caption_element->{'contents'}->[0], 'float caption');
     }
     return $prepended.$content.$caption_text;
   }
@@ -5380,8 +5386,8 @@ sub _convert_float_command($$$$$)
     # if not empty?
     $prepended_text = $self->convert_tree_new_formatting_context(
                                {'cmdname' => 'strong',
-                                'args' => [{'type' => 'brace_container',
-                                            'contents' => [$prepended]}]},
+                                'contents' => [{'type' => 'brace_container',
+                                               'contents' => [$prepended]}]},
                                'float number type');
     if ($caption_element) {
       # register the converted prepended tree to be prepended to
@@ -5389,7 +5395,7 @@ sub _convert_float_command($$$$$)
       $self->register_pending_formatted_inline_content($caption_command_name,
                                                        $prepended_text);
       $caption_text = $self->convert_tree_new_formatting_context(
-                   $caption_element->{'args'}->[0], 'float caption');
+                   $caption_element->{'contents'}->[0], 'float caption');
       my $cancelled_prepended
         = 
$self->cancel_pending_formatted_inline_content($caption_command_name);
       # unset if prepended text is in caption, i.e. is not cancelled
@@ -5401,7 +5407,7 @@ sub _convert_float_command($$$$$)
     }
   } elsif (defined($caption_element)) {
     $caption_text = $self->convert_tree_new_formatting_context(
-                   $caption_element->{'args'}->[0], 'float caption');
+                   $caption_element->{'contents'}->[0], 'float caption');
   }
 
   if (defined($caption_text) and $caption_text ne '') {
@@ -5815,7 +5821,7 @@ sub _convert_xref_commands($$$$)
     if ($args->[4] and defined($args->[4]->{'normal'})
         and $args->[4]->{'normal'} ne '');
 
-  my $arg_node = $command->{'args'}->[0];
+  my $arg_node = $command->{'contents'}->[0];
 
   # internal reference
   if ($cmdname ne 'inforef' and !defined($book) and !defined($file)
@@ -6309,9 +6315,10 @@ sub _convert_printindex_command($$$$)
         }
         my $referred_tree = {};
         $referred_tree->{'type'} = '_code' if ($in_code);
-        if ($referred_entry->{'args'} and $referred_entry->{'args'}->[0]
-            and $referred_entry->{'args'}->[0]->{'contents'}) {
-          $referred_tree->{'contents'} = [$referred_entry->{'args'}->[0]];
+        if ($referred_entry->{'contents'}
+            and $referred_entry->{'contents'}->[0]
+            and $referred_entry->{'contents'}->[0]->{'contents'}) {
+          $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
         }
         my $entry;
         # for @seealso, to appear where chapter/node ususally appear
@@ -11449,7 +11456,7 @@ sub _default_format_single_footnote($$$$$$)
   my $self = shift;
   my ($command, $footid, $number_in_doc, $href, $mark) = @_;
   my $footnote_text
-      = $self->convert_tree_new_formatting_context($command->{'args'}->[0],
+      = $self->convert_tree_new_formatting_context($command->{'contents'}->[0],
                             "$command->{'cmdname'} $number_in_doc $footid");
   chomp ($footnote_text);
   $footnote_text .= "\n";
@@ -12605,8 +12612,9 @@ sub _prepare_converted_output_info($$$$)
       }
     }
     if (!$fulltitle_tree and $global_commands->{'titlefont'}
-        and $global_commands->{'titlefont'}->[0]->{'args'}
-        and $global_commands->{'titlefont'}->[0]->{'args'}->[0]->{'contents'}) 
{
+        and $global_commands->{'titlefont'}->[0]->{'contents'}
+        and $global_commands->{'titlefont'}->[0]->{'contents'}->[0]
+                                                        ->{'contents'}) {
       $fulltitle_tree = $global_commands->{'titlefont'}->[0];
     }
   }
@@ -13544,8 +13552,8 @@ sub _convert($$;$)
                                                  $command_name, $element);
       }
       my $content_formatted = '';
-      if ($element->{'contents'}) {
-        if ($convert_to_latex and !$brace_commands{$command_name}) {
+      if ($element->{'contents'} and !$brace_commands{$command_name}) {
+        if ($convert_to_latex) {
           # displaymath
           $content_formatted
            = Texinfo::Convert::LaTeX::convert_to_latex_math(undef,
@@ -13571,14 +13579,20 @@ sub _convert($$;$)
               or $command_name eq 'smallquotation')
           or $command_name eq 'float'
           or $command_name eq 'cartouche') {
-        if ($element->{'args'}) {
+        my $arguments_list;
+        if ($brace_commands{$command_name}) {
+          $arguments_list = $element->{'contents'};
+        } else {
+          $arguments_list = $element->{'args'};
+        }
+        if ($arguments_list) {
           $args_formatted = [];
           my @args_specification;
           @args_specification = @{$html_default_commands_args{$command_name}}
             if (defined($html_default_commands_args{$command_name}));
           my $spec_nr = scalar(@args_specification);
           my $arg_idx = -1;
-          foreach my $arg (@{$element->{'args'}}) {
+          foreach my $arg (@{$arguments_list}) {
             $arg_idx++;
             my $arg_spec;
             if ($arg_idx < $spec_nr) {
@@ -13716,8 +13730,8 @@ sub _convert($$;$)
 
     my $content_formatted = '';
     if ($type_name eq 'definfoenclose_command') {
-      if ($element->{'args'}) {
-        $content_formatted = $self->_convert($element->{'args'}->[0],
+      if ($element->{'contents'}) {
+        $content_formatted = $self->_convert($element->{'contents'}->[0],
                                              "DEFINFOENCLOSE_ARG");
       }
     } elsif ($element->{'contents'}
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index b0d0f2395b..90279539b7 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -544,7 +544,7 @@ sub format_ref($$$$)
   my $formatter = shift;
 
   my @args;
-  for my $arg (@{$element->{'args'}}) {
+  for my $arg (@{$element->{'contents'}}) {
     if (defined $arg->{'contents'}) {
       push @args, $arg;
     } else {
@@ -553,7 +553,7 @@ sub format_ref($$$$)
   }
   $args[0] = {'text' => ''} if (!defined($args[0]));
 
-  my $node_arg = $element->{'args'}->[0];
+  my $node_arg = $element->{'contents'}->[0];
 
   # normalize node name, to get a ref with the right formatting
   # NOTE as a consequence, the line numbers appearing in case of errors
@@ -963,23 +963,23 @@ sub format_image_element($$)
 
   my $lines_count = 0;
 
-  if ($element->{'args'}
-      and $element->{'args'}->[0]->{'contents'}) {
+  if ($element->{'contents'}
+      and $element->{'contents'}->[0]->{'contents'}) {
     Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
     my $basefile = Texinfo::Convert::Text::convert_to_text(
-                                         $element->{'args'}->[0],
+                                         $element->{'contents'}->[0],
                                    $self->{'convert_text_options'});
     Texinfo::Convert::Text::reset_options_code(
                                  $self->{'convert_text_options'});
 
-    if (defined($element->{'args'}->[4])
-        and $element->{'args'}->[4]->{'contents'}
-        and @{$element->{'args'}->[4]->{'contents'}}) {
+    if (defined($element->{'contents'}->[4])
+        and $element->{'contents'}->[4]->{'contents'}
+        and @{$element->{'contents'}->[4]->{'contents'}}) {
       Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
       my $extension = Texinfo::Convert::Text::convert_to_text(
-                                         $element->{'args'}->[4],
+                                         $element->{'contents'}->[4],
                                    $self->{'convert_text_options'});
       Texinfo::Convert::Text::reset_options_code(
                                  $self->{'convert_text_options'});
@@ -1004,11 +1004,11 @@ sub format_image_element($$)
     # remove last end of line
     chomp($text) if (defined($text));
     my $alt;
-    if (defined($element->{'args'}->[3])
-        and $element->{'args'}->[3]->{'contents'}
-        and @{$element->{'args'}->[3]->{'contents'}}) {
+    if (defined($element->{'contents'}->[3])
+        and $element->{'contents'}->[3]->{'contents'}
+        and @{$element->{'contents'}->[3]->{'contents'}}) {
      $alt = Texinfo::Convert::Text::convert_to_text(
-                                    $element->{'args'}->[3],
+                                    $element->{'contents'}->[3],
                                   $self->{'convert_text_options'});
     }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 85d440b826..6cb6df0d25 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1859,7 +1859,7 @@ sub _begin_document($)
       $result .= "\\end{titlepage}\n";
     } else {
       my $element = $global_commands->{'shorttitlepage'};
-      my $title_text = _title_font($self, $element);
+      my $title_text = _title($self, $element);
       $result .= "\\begin{titlepage}\n";
       $result .= "{\\raggedright $title_text}\n";
       # first newpage ends the title page, phantom and second newpage
@@ -2315,7 +2315,7 @@ sub _close_preformatted_stack($$)
   return $result;
 }
 
-sub _title_font($$)
+sub _title($$)
 {
   my $self = shift;
   my $element = shift;
@@ -2330,6 +2330,21 @@ sub _title_font($$)
   return '';
 }
 
+sub _title_font($$)
+{
+  my $self = shift;
+  my $element = shift;
+
+  if ($element->{'contents'} and $element->{'contents'}->[0]->{'contents'}) {
+    # in Texinfo TeX seems a bit smaller, but LARGE seems too small
+    my $result = "{\\huge \\bfseries ";
+    $result .= _convert($self, $element->{'contents'}->[0]);
+    $result .= '}';
+    return $result;
+  }
+  return '';
+}
+
 sub _set_environment_options($$$)
 {
   my $self = shift;
@@ -2539,9 +2554,9 @@ sub _index_entry($$)
     my $seeresult = '';
     foreach my $seecommand (('seeentry', 'seealso')) {
       if ($element->{'extra'}->{$seecommand}
-          and $element->{'extra'}->{$seecommand}->{'args'}->[0]) {
+          and $element->{'extra'}->{$seecommand}->{'contents'}->[0]) {
         my $seeconverted = _convert($self,
-                 $element->{'extra'}->{$seecommand}->{'args'}->[0]);
+                 $element->{'extra'}->{$seecommand}->{'contents'}->[0]);
         $seeresult = '|'.$LaTeX_see_index_commands_text{$seecommand}.'{'
                    .$seeconverted.'}';
          last;
@@ -3015,14 +3030,14 @@ sub _convert($$)
         if ($LaTeX_accent_commands{$command_format_context}->{$cmdname}) {
           $result
            .= 
"\\$LaTeX_accent_commands{$command_format_context}->{$cmdname}\{";
-          if ($element->{'args'}) {
-            $accent_arg = _convert($self, $element->{'args'}->[0]);
+          if ($element->{'contents'}) {
+            $accent_arg = _convert($self, $element->{'contents'}->[0]);
           }
           $result .= $accent_arg;
           $result .= '}';
         } elsif ($cmdname eq 'dotless') {
-          if ($element->{'args'}) {
-            $accent_arg = _convert($self, $element->{'args'}->[0]);
+          if ($element->{'contents'}) {
+            $accent_arg = _convert($self, $element->{'contents'}->[0]);
           }
           if ($accent_arg eq 'i' or $accent_arg eq 'j') {
             if ($command_format_context eq 'cmd_math') {
@@ -3042,10 +3057,10 @@ sub _convert($$)
           $result
                .= 
"\\textsl{\\$LaTeX_accent_commands{'cmd_text'}->{$cmdname}\{";
           # we do not want accents within to be math accents
-          if ($element->{'args'}) {
+          if ($element->{'contents'}) {
             push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
                  'ctx_text';
-            $accent_arg = _convert($self, $element->{'args'}->[0]);
+            $accent_arg = _convert($self, $element->{'contents'}->[0]);
             my $old_context
               = pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
           }
@@ -3100,8 +3115,8 @@ sub _convert($$)
         }
         $result .= "$LaTeX_style_command\{";
       }
-      if ($element->{'args'}) {
-        $result .= _convert($self, $element->{'args'}->[0]);
+      if ($element->{'contents'}) {
+        $result .= _convert($self, $element->{'contents'}->[0]);
       }
       if ($LaTeX_style_brace_commands{$command_format_context}
                                                    ->{$formatted_cmdname}) {
@@ -3121,9 +3136,10 @@ sub _convert($$)
       $result .= _convert_def_line($self, $element);
     } elsif ($cmdname eq 'dmn') {
       $result .= '\\thinspace ';
-      if ($element->{'args'}) {
-        $result .= _convert($self, $element->{'args'}->[0]);
+      if ($element->{'contents'}) {
+        $result .= _convert($self, $element->{'contents'}->[0]);
       }
+      return $result;
     } elsif ($cmdname eq 'verb') {
       # NOTE \verb is forbidden in other macros in LaTeX.  We do
       # not enforce this constraint here, nor warn.  Checking
@@ -3142,8 +3158,8 @@ sub _convert($$)
       my @lines;
 
       push @{$self->{'formatting_context'}->[-1]->{'text_context'}}, 'ctx_raw';
-      if ($element->{'args'}) {
-        $contents = _convert($self, $element->{'args'}->[0]);
+      if ($element->{'contents'}) {
+        $contents = _convert($self, $element->{'contents'}->[0]);
         @lines = split /\n/, $contents, -1;
       }
       my $old_context
@@ -3169,8 +3185,8 @@ sub _convert($$)
       $result .= join "\\\\\n", @lines_out;
       return $result;
     } elsif ($cmdname eq 'image') {
-      if ($element->{'args'}
-          and $element->{'args'}->[0]->{'contents'}) {
+      if ($element->{'contents'}
+          and $element->{'contents'}->[0]->{'contents'}) {
         # distinguish text basefile used to find the file and
         # converted basefile with special characters escaped
         Texinfo::Convert::Text::set_options_code(
@@ -3178,7 +3194,7 @@ sub _convert($$)
         Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
                                   $self->{'convert_text_options'});
         my $basefile = Texinfo::Convert::Text::convert_to_text(
-                                        $element->{'args'}->[0],
+                                        $element->{'contents'}->[0],
                                     $self->{'convert_text_options'});
         Texinfo::Convert::Text::reset_options_code(
                                  $self->{'convert_text_options'});
@@ -3218,14 +3234,14 @@ sub _convert($$)
         $converted_basefile =~ s/([%{}\\])/\\$1/g;
         my $image_file = $converted_basefile;
         my $width;
-        if ((@{$element->{'args'}} >= 2)
-              and defined($element->{'args'}->[1])
-              and $element->{'args'}->[1]->{'contents'}
-              and @{$element->{'args'}->[1]->{'contents'}}){
+        if ((@{$element->{'contents'}} >= 2)
+              and defined($element->{'contents'}->[1])
+              and $element->{'contents'}->[1]->{'contents'}
+              and @{$element->{'contents'}->[1]->{'contents'}}){
           push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
                'ctx_raw';
           $width = _convert($self, {'contents'
-                         => $element->{'args'}->[1]->{'contents'}});
+                         => $element->{'contents'}->[1]->{'contents'}});
           my $old_context
             = pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
           die if ($old_context ne 'ctx_raw');
@@ -3234,14 +3250,14 @@ sub _convert($$)
           }
         }
         my $height;
-        if ((@{$element->{'args'}} >= 3)
-              and defined($element->{'args'}->[2])
-              and $element->{'args'}->[2]->{'contents'}
-              and @{$element->{'args'}->[2]->{'contents'}}) {
+        if ((@{$element->{'contents'}} >= 3)
+              and defined($element->{'contents'}->[2])
+              and $element->{'contents'}->[2]->{'contents'}
+              and @{$element->{'contents'}->[2]->{'contents'}}) {
           push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
                'ctx_raw';
           $height = _convert($self, {'contents'
-                         => $element->{'args'}->[2]->{'contents'}});
+                         => $element->{'contents'}->[2]->{'contents'}});
           my $old_context
              = pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
           die if ($old_context ne 'ctx_raw');
@@ -3267,18 +3283,18 @@ sub _convert($$)
       }
       return $result;
     } elsif ($cmdname eq 'email') {
-      if ($element->{'args'}) {
+      if ($element->{'contents'}) {
         my $name;
         my $converted_name;
         my $email_arg;
         my $email_text;
-        if (scalar (@{$element->{'args'}}) == 2
-            and $element->{'args'}->[1]->{'contents'}) {
-          $name = $element->{'args'}->[1];
+        if (scalar (@{$element->{'contents'}}) == 2
+            and $element->{'contents'}->[1]->{'contents'}) {
+          $name = $element->{'contents'}->[1];
           $converted_name = _convert($self, $name);
         }
-        if ($element->{'args'}->[0]->{'contents'}) {
-          $email_arg = $element->{'args'}->[0];
+        if ($element->{'contents'}->[0]->{'contents'}) {
+          $email_arg = $element->{'contents'}->[0];
           Texinfo::Convert::Text::set_options_code(
                           $self->{'convert_text_options'});
           $email_text
@@ -3298,13 +3314,13 @@ sub _convert($$)
       }
       return $result;
     } elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
-      if ($element->{'args'}) {
-        if (scalar(@{$element->{'args'}}) == 3
-             and $element->{'args'}->[2]->{'contents'}) {
+      if ($element->{'contents'}) {
+        if (scalar(@{$element->{'contents'}}) == 3
+             and $element->{'contents'}->[2]->{'contents'}) {
           unshift @{$self->{'current_contents'}->[-1]},
-                     $element->{'args'}->[2];
-        } elsif ($element->{'args'}->[0]->{'contents'}) {
-          my $url_arg = $element->{'args'}->[0];
+                     $element->{'contents'}->[2];
+        } elsif ($element->{'contents'}->[0]->{'contents'}) {
+          my $url_arg = $element->{'contents'}->[0];
           Texinfo::Convert::Text::set_options_code(
                                    $self->{'convert_text_options'});
           my $url_text = $self->_protect_url(
@@ -3312,9 +3328,9 @@ sub _convert($$)
                                  $self->{'convert_text_options'}));
           Texinfo::Convert::Text::reset_options_code(
                                    $self->{'convert_text_options'});
-          if (scalar(@{$element->{'args'}}) == 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            my $description_text = _convert($self, $element->{'args'}->[1]);
+          if (scalar(@{$element->{'contents'}}) == 2
+              and $element->{'contents'}->[1]->{'contents'}) {
+            my $description_text = _convert($self, 
$element->{'contents'}->[1]);
             my $text = $self->cdt_string('{text} ({url})',
               {'text' => $description_text, 'url' => 
"\\nolinkurl{$url_text}"});
             $result .= "\\href{$url_text}{$text}";
@@ -3323,42 +3339,42 @@ sub _convert($$)
             $result .= "\\url{$url_text}";
             return $result;
           }
-        } elsif (scalar(@{$element->{'args'}}) == 2
-                 and defined($element->{'args'}->[1])
-                 and $element->{'args'}->[1]->{'contents'}
-                 and @{$element->{'args'}->[1]->{'contents'}}) {
+        } elsif (scalar(@{$element->{'contents'}}) == 2
+                 and defined($element->{'contents'}->[1])
+                 and $element->{'contents'}->[1]->{'contents'}
+                 and @{$element->{'contents'}->[1]->{'contents'}}) {
           unshift @{$self->{'current_contents'}->[-1]},
-            {'contents' => $element->{'args'}->[1]->{'contents'}};
+            {'contents' => $element->{'contents'}->[1]->{'contents'}};
         }
       }
       return $result;
     } elsif ($cmdname eq 'footnote') {
       _push_new_context($self, 'footnote');
       $result .= '\footnote{';
-      if ($element->{'args'}) {
-        $result .= $self->_convert($element->{'args'}->[0]);
+      if ($element->{'contents'}) {
+        $result .= $self->_convert($element->{'contents'}->[0]);
       }
       $result .= '}';
       _pop_context($self);
       return $result;
     } elsif ($cmdname eq 'anchor') {
-      if ($element->{'args'}) {
+      if ($element->{'contents'}) {
         my $anchor_label
-           = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
+           = _tree_anchor_label($element->{'contents'}->[0]->{'contents'});
         $result .= "\\label{$anchor_label}%\n";
       }
       return $result;
     } elsif ($ref_commands{$cmdname}) {
-      if ($element->{'args'} and scalar(@{$element->{'args'}})) {
+      if ($element->{'contents'} and scalar(@{$element->{'contents'}})) {
         my @args;
-        for my $arg (@{$element->{'args'}}) {
+        for my $arg (@{$element->{'contents'}}) {
           if (defined $arg->{'contents'} and @{$arg->{'contents'}}) {
             push @args, $arg;
           } else {
             push @args, undef;
           }
         }
-        my $node_arg = $element->{'args'}->[0];
+        my $node_arg = $element->{'contents'}->[0];
         if (($cmdname eq 'link' or $cmdname eq 'inforef')
             and scalar(@args) == 3) {
           $args[3] = $args[2]; # use as the manual argument
@@ -3629,26 +3645,26 @@ sub _convert($$)
       }
       return $result;
     } elsif ($explained_commands{$cmdname}) {
-      if ($element->{'args'}
-          and $element->{'args'}->[0]->{'contents'}) {
+      if ($element->{'contents'}
+          and $element->{'contents'}->[0]->{'contents'}) {
         # in abbr spaces never end a sentence.
         my $argument;
         if ($cmdname eq 'abbr') {
           $argument = {'type' => '_dot_not_end_sentence',
-                       'contents' => [$element->{'args'}->[0]]};
+                       'contents' => [$element->{'contents'}->[0]]};
         } else {
         # TODO in TeX, acronym is in a smaller font (1pt less).
-          $argument = $element->{'args'}->[0];
+          $argument = $element->{'contents'}->[0];
         }
-        if (scalar (@{$element->{'args'}}) == 2
-            and defined($element->{'args'}->[-1])
-            and $element->{'args'}->[-1]->{'contents'}
-            and @{$element->{'args'}->[-1]->{'contents'}}) {
+        if (scalar (@{$element->{'contents'}}) == 2
+            and defined($element->{'contents'}->[-1])
+            and $element->{'contents'}->[-1]->{'contents'}
+            and @{$element->{'contents'}->[-1]->{'contents'}}) {
           my $prepended
            = $self->cdt('{abbr_or_acronym} ({explanation})',
                         {'abbr_or_acronym' => $argument,
                          'explanation'
-                                   => $element->{'args'}->[-1]});
+                                   => $element->{'contents'}->[-1]});
           $result .= _convert($self, $prepended);
         } else {
           $result .= _convert($self, $argument);
@@ -3664,16 +3680,16 @@ sub _convert($$)
                                         ->{$element->{'extra'}->{'format'}})) {
         $arg_index = 2;
       }
-      if (scalar(@{$element->{'args'}}) > $arg_index
-         and defined($element->{'args'}->[$arg_index])
-         and $element->{'args'}->[$arg_index]->{'contents'}
-         and scalar(@{$element->{'args'}->[$arg_index]->{'contents'}})) {
+      if (scalar(@{$element->{'contents'}}) > $arg_index
+         and defined($element->{'contents'}->[$arg_index])
+         and $element->{'contents'}->[$arg_index]->{'contents'}
+         and scalar(@{$element->{'contents'}->[$arg_index]->{'contents'}})) {
         if ($cmdname eq 'inlineraw') {
           push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
                'ctx_raw';
         }
         $result .= _convert($self, {'contents'
-                         => $element->{'args'}->[$arg_index]->{'contents'}});
+                       => $element->{'contents'}->[$arg_index]->{'contents'}});
         if ($cmdname eq 'inlineraw') {
           my $old_context
               = pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
@@ -3686,9 +3702,9 @@ sub _convert($$)
       if (not exists($block_commands{$cmdname})) {
         push @{$self->{'formatting_context'}->[-1]->{'math_style'}}, 
'one-line';
         if ($cmdname eq 'math') {
-          if ($element->{'args'}) {
+          if ($element->{'contents'}) {
             $result .= '$';
-            $result .= _convert($self, $element->{'args'}->[0]);
+            $result .= _convert($self, $element->{'contents'}->[0]);
             $result .= '$';
           }
         }
@@ -3729,9 +3745,9 @@ sub _convert($$)
         }
       }
       my $caption_text = '';
-      if ($element->{'args'}->[0]->{'contents'}) {
+      if ($element->{'contents'}->[0]->{'contents'}) {
         _push_new_context($self, 'latex_caption');
-        $caption_text = _convert($self, $element->{'args'}->[0]);
+        $caption_text = _convert($self, $element->{'contents'}->[0]);
         _pop_context($self);
       }
 
@@ -3752,9 +3768,10 @@ sub _convert($$)
       }
 
       if (defined($shortcaption)
-          and $shortcaption->{'args'}->[0]->{'contents'}) {
+          and $shortcaption->{'contents'}->[0]->{'contents'}) {
         _push_new_context($self, 'latex_shortcaption');
-        my $shortcaption_text = _convert($self, $shortcaption->{'args'}->[0]);
+        my $shortcaption_text
+          = _convert($self, $shortcaption->{'contents'}->[0]);
         _pop_context($self);
         $result .= '['.$shortcaption_text.']';
       }
@@ -3764,10 +3781,10 @@ sub _convert($$)
       $result .= _title_font($self, $element);
       return $result;
     } elsif ($cmdname eq 'U') {
-      if ($element->{'args'}
-          and $element->{'args'}->[0]->{'contents'}
-          and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
-        my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+      if ($element->{'contents'}
+          and $element->{'contents'}->[0]->{'contents'}
+          and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+        my $arg_text = 
$element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
 
         if (defined($arg_text)) {
           # Syntactic checks on the value were already done in Parser.pm,
@@ -3797,7 +3814,7 @@ sub _convert($$)
     } elsif ($cmdname eq 'value') {
       my $expansion = $self->cdt('@{No value for `{value}\'@}',
                                  {'value'
-                                    => $element->{'args'}->[0]});
+                                    => $element->{'contents'}->[0]});
       $expansion = {'type' => 'paragraph',
                     'contents' => [$expansion]};
       $result .= _convert($self, $expansion);
@@ -4149,7 +4166,7 @@ sub _convert($$)
       }
       return $result;
     } elsif ($cmdname eq 'title') {
-      my $title_text = _title_font($self, $element);
+      my $title_text = _title($self, $element);
       # FIXME In Texinfo TeX the interline space seems more even
       $result .= "{\\raggedright $title_text}\n";
       # same formatting for the rule as in Texinfo TeX
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm 
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index d8ad62ec12..f58212b3cb 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -294,8 +294,8 @@ sub _convert($)
       return $result;
     # commands with braces
     } elsif ($accent_commands{$cmdname}) {
-      return '' if (!$element->{'args'});
-      my $accent_text = _convert($element->{'args'}->[0]);
+      return '' if (!$element->{'contents'});
+      my $accent_text = _convert($element->{'contents'}->[0]);
       my $accented_char
         = Texinfo::Convert::Unicode::unicode_accent($accent_text,
                                                     $element);
@@ -313,20 +313,20 @@ sub _convert($)
         @args_try_order = (0, 1, 2, 4, 3);
       }
       foreach my $index (@args_try_order) {
-        if (defined($element->{'args'}->[$index])) {
-          my $text = _convert($element->{'args'}->[$index]);
+        if (defined($element->{'contents'}->[$index])) {
+          my $text = _convert($element->{'contents'}->[$index]);
           return $text if (defined($text) and $text =~ /\S/);
         }
       }
       return '';
     # Here all the commands with args are processed, if they have
     # more than one arg the first one is used.
-    } elsif ($element->{'args'} and $element->{'args'}->[0]
-           and (($element->{'args'}->[0]->{'type'}
-                 and ($element->{'args'}->[0]->{'type'} eq 'brace_container'
-             or $element->{'args'}->[0]->{'type'} eq 'brace_arg'))
+    } elsif ($element->{'contents'} and $element->{'contents'}->[0]
+           and (($element->{'contents'}->[0]->{'type'}
+                 and ($element->{'contents'}->[0]->{'type'} eq 
'brace_container'
+             or $element->{'contents'}->[0]->{'type'} eq 'brace_arg'))
                 or $cmdname eq 'math')) {
-      return _convert($element->{'args'}->[0]);
+      return _convert($element->{'contents'}->[0]);
     }
   }
   my $result = '';
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 2a6f3674bd..653bd3b191 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -199,7 +199,8 @@ foreach my $nobrace_command (keys(%nobrace_commands)) {
 
 my %ignored_commands = (%ignored_line_commands, %ignored_nobrace_commands);
 foreach my $ignored_brace_commands ('caption', 'shortcaption',
-                                    'hyphenation', 'sortas') {
+                                    'hyphenation', 'sortas', 'errormsg',
+                                    'seeentry', 'seealso') {
   $ignored_commands{$ignored_brace_commands} = 1;
 }
 
@@ -1316,7 +1317,7 @@ sub process_footnotes($;$)
             'contents' => [$label_element,
                            {'text' => $footnote_anchor_postfix}]};
         $self->add_location({'cmdname' => 'anchor',
-                    'args' => [$footnote_anchor_arg],
+                    'contents' => [$footnote_anchor_arg],
                     'extra' => {'is_target' => 1,
                         'normalized'
        => $node_element->{'extra'}->{'normalized'}.$footnote_anchor_postfix},
@@ -1338,8 +1339,8 @@ sub process_footnotes($;$)
       _stream_output($self, $footnote_text);
 
       my $footnote_element = $footnote_info->{'footnote_element'};
-      if ($footnote_element->{'args'}) {
-        _convert($self, $footnote_element->{'args'}->[0]);
+      if ($footnote_element->{'contents'}) {
+        _convert($self, $footnote_element->{'contents'}->[0]);
       }
       _add_newline_if_needed($self);
 
@@ -1800,9 +1801,9 @@ sub process_printindex($$;$)
       my $referred_tree = {};
       $referred_tree->{'type'} = '_code'
         if ($indices_information->{$entry_index_name}->{'in_code'});
-      if ($referred_entry->{'args'} and $referred_entry->{'args'}->[0]
-          and $referred_entry->{'args'}->[0]->{'contents'}) {
-        $referred_tree->{'contents'} = [$referred_entry->{'args'}->[0]];
+      if ($referred_entry->{'contents'} and $referred_entry->{'contents'}->[0]
+          and $referred_entry->{'contents'}->[0]->{'contents'}) {
+        $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
       }
 
       # indent with the same width as '* ', but do not use * such that the
@@ -1962,14 +1963,14 @@ sub format_ref($$$$)
   my $formatter = shift;
 
   my @args;
-  for my $arg (@{$element->{'args'}}) {
+  for my $arg (@{$element->{'contents'}}) {
     if (defined $arg->{'contents'}) {
       push @args, $arg;
     } else {
       push @args, undef;
     }
   }
-  my $node_arg = $element->{'args'}->[0];
+  my $node_arg = $element->{'contents'}->[0];
 
   # normalize node name, to get a ref with the right formatting
   # NOTE as a consequence, the line numbers appearing in case of errors
@@ -2210,10 +2211,10 @@ sub image_formatted_text($$$$)
   my $result;
   if (defined($text)) {
     $result = $text;
-  } elsif (scalar(@{$element->{'args'}}) >= 4
-           and $element->{'args'}->[3]->{'contents'}) {
+  } elsif (scalar(@{$element->{'contents'}}) >= 4
+           and $element->{'contents'}->[3]->{'contents'}) {
     $result = '[' .Texinfo::Convert::Text::convert_to_text(
-         $element->{'args'}->[3], $self->{'convert_text_options'}) .']';
+         $element->{'contents'}->[3], $self->{'convert_text_options'}) .']';
   } else {
     $self->plaintext_line_warn($self, sprintf(__(
                     "could not find \@image file `%s.txt' nor alternate text"),
@@ -2227,12 +2228,12 @@ sub format_image_element($$)
 {
   my ($self, $element) = @_;
 
-  if ($element->{'args'}
-      and $element->{'args'}->[0]->{'contents'}) {
+  if ($element->{'contents'}
+      and $element->{'contents'}->[0]->{'contents'}) {
     Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
     my $basefile = Texinfo::Convert::Text::convert_to_text(
-                                      $element->{'args'}->[0],
+                                      $element->{'contents'}->[0],
                                       $self->{'convert_text_options'});
     Texinfo::Convert::Text::reset_options_code(
                                  $self->{'convert_text_options'});
@@ -2971,12 +2972,13 @@ sub _convert($$)
                        add_next($formatter->{'container'}, $text_before, 1),
                        $formatter->{'container'})
            if ($text_before ne '');
-        if ($element->{'args'}) {
-          _convert($self, $element->{'args'}->[0]);
+        if ($element->{'contents'}) {
+          _convert($self, $element->{'contents'}->[0]);
           if ($cmdname eq 'strong'
-              and $element->{'args'}->[0]->{'contents'}
-              and defined($element->{'args'}->[0]->{'contents'}->[0]->{'text'})
-              and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}
+              and $element->{'contents'}->[0]->{'contents'}
+              and defined($element->{'contents'}->[0]->{'contents'}->[0]
+                                                                   ->{'text'})
+              and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}
                     =~ /^Note\s/i
               and $self->format_warn_strong_note()) {
             $self->plaintext_line_warn($self, __(
@@ -3027,16 +3029,16 @@ sub _convert($$)
         }
         return;
       } elsif ($cmdname eq 'link') {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           # Use arg 2 if present, otherwise use arg 1.  Do not produce
           # functional link in Info/plaintext output.
           my $text_arg;
 
-          if (scalar(@{$element->{'args'}}) >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            $text_arg = $element->{'args'}->[1];
-          } elsif ($element->{'args'}->[0]->{'contents'}) {
-            $text_arg = $element->{'args'}->[0];
+          if (scalar(@{$element->{'contents'}}) >= 2
+              and $element->{'contents'}->[1]->{'contents'}) {
+            $text_arg = $element->{'contents'}->[1];
+          } elsif ($element->{'contents'}->[0]->{'contents'}) {
+            $text_arg = $element->{'contents'}->[0];
           }
           if (defined($text_arg)) {
             _convert($self, $text_arg);
@@ -3046,7 +3048,7 @@ sub _convert($$)
       } elsif ($ref_commands{$cmdname}) {
         # no args may happen with bogus @-commands without argument, maybe only
         # at the end of a document
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           $self->format_ref($cmdname, $element, $formatter);
         }
         return;
@@ -3112,15 +3114,15 @@ sub _convert($$)
         }
         return;
       } elsif ($cmdname eq 'email') {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           my $name;
           my $email;
-          if (scalar (@{$element->{'args'}}) >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
-            $name = $element->{'args'}->[1];
+          if (scalar (@{$element->{'contents'}}) >= 2
+              and $element->{'contents'}->[1]->{'contents'}) {
+            $name = $element->{'contents'}->[1];
           }
-          if ($element->{'args'}->[0]->{'contents'}) {
-            $email = $element->{'args'}->[0];
+          if ($element->{'contents'}->[0]->{'contents'}) {
+            $email = $element->{'contents'}->[0];
           }
           my $email_tree;
           if ($name and $email) {
@@ -3139,28 +3141,28 @@ sub _convert($$)
         return;
       } elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
         my $inserted;
-        if ($element->{'args'}) {
-          if (scalar(@{$element->{'args'}}) == 3
-               and $element->{'args'}->[2]->{'contents'}) {
+        if ($element->{'contents'}) {
+          if (scalar(@{$element->{'contents'}}) == 3
+               and $element->{'contents'}->[2]->{'contents'}) {
             $inserted = {'type' => '_stop_upper_case',
-                         'contents' => [$element->{'args'}->[2]]};
-          } elsif ($element->{'args'}->[0]->{'contents'}) {
+                         'contents' => [$element->{'contents'}->[2]]};
+          } elsif ($element->{'contents'}->[0]->{'contents'}) {
             # no mangling of --- and similar in url.
             my $url = {'type' => '_stop_upper_case',
               'contents' => [
                {'type' => '_code',
-                'contents' => [$element->{'args'}->[0]]}]};
-            if (scalar(@{$element->{'args'}}) == 2
-                and $element->{'args'}->[1]->{'contents'}) {
+                'contents' => [$element->{'contents'}->[0]]}]};
+            if (scalar(@{$element->{'contents'}}) == 2
+                and $element->{'contents'}->[1]->{'contents'}) {
               $inserted = $self->cdt('{text} ({url})',
-                   {'text' => $element->{'args'}->[1],
+                   {'text' => $element->{'contents'}->[1],
                     'url' => $url });
             } else {
               $inserted = $self->cdt('@t{<{url}>}', {'url' => $url});
             }
-          } elsif (scalar(@{$element->{'args'}}) == 2
-                   and $element->{'args'}->[1]->{'contents'}) {
-            $inserted = $element->{'args'}->[1];
+          } elsif (scalar(@{$element->{'contents'}}) == 2
+                   and $element->{'contents'}->[1]->{'contents'}) {
+            $inserted = $element->{'contents'}->[1];
           }
         }
         if ($inserted) {
@@ -3191,7 +3193,7 @@ sub _convert($$)
           _convert($self, {'contents' =>
            [{'text' => ' ('},
             {'cmdname' => 'pxref',
-             'args' => [
+             'contents' => [
                {'type' => 'brace_arg',
                 'contents' => [
                    $self->{'current_node'}->{'args'}->[0],
@@ -3210,21 +3212,21 @@ sub _convert($$)
         _anchor($self, $element);
         return;
       } elsif ($explained_commands{$cmdname}) {
-        if ($element->{'args'}
-            and $element->{'args'}->[0]->{'contents'}) {
+        if ($element->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}) {
           # in abbr spaces never end a sentence.
           my $argument;
           if ($cmdname eq 'abbr') {
             $argument = {'type' => 'frenchspacing',
-                         'contents' => [$element->{'args'}->[0]]};
+                         'contents' => [$element->{'contents'}->[0]]};
           } else {
-            $argument = $element->{'args'}->[0];
+            $argument = $element->{'contents'}->[0];
           }
-          if (scalar(@{$element->{'args'}}) >= 2
-              and $element->{'args'}->[1]->{'contents'}) {
+          if (scalar(@{$element->{'contents'}}) >= 2
+              and $element->{'contents'}->[1]->{'contents'}) {
             my $inserted = $self->cdt('{abbr_or_acronym} ({explanation})',
                    {'abbr_or_acronym' => $argument,
-                    'explanation' => $element->{'args'}->[1]});
+                    'explanation' => $element->{'contents'}->[1]});
             _convert($self, $inserted);
             return;
           } else {
@@ -3245,11 +3247,11 @@ sub _convert($$)
                                         ->{$element->{'extra'}->{'format'}})) {
           $arg_index = 2;
         }
-        if (scalar(@{$element->{'args'}}) > $arg_index
-           and defined($element->{'args'}->[$arg_index])
-           and $element->{'args'}->[$arg_index]->{'contents'}
-           and scalar(@{$element->{'args'}->[$arg_index]->{'contents'}})) {
-          my $arg = $element->{'args'}->[$arg_index];
+        if (scalar(@{$element->{'contents'}}) > $arg_index
+           and defined($element->{'contents'}->[$arg_index])
+           and $element->{'contents'}->[$arg_index]->{'contents'}
+           and scalar(@{$element->{'contents'}->[$arg_index]->{'contents'}})) {
+          my $arg = $element->{'contents'}->[$arg_index];
           my $argument;
           if ($cmdname eq 'inlineraw') {
             $argument = {'type' => '_stop_upper_case',
@@ -3263,7 +3265,7 @@ sub _convert($$)
         return;
         # condition should actually be that the $cmdname is inline
       } elsif ($math_commands{$cmdname}) {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           push @{$self->{'context'}}, $cmdname;
           if ($self->{'elements_images'}
               and $self->{'elements_images'}->{$element}) {
@@ -3282,7 +3284,7 @@ sub _convert($$)
           }
           _convert($self, {'type' => 'frenchspacing',
                'contents' => [{'type' => '_code',
-                              'contents' => [$element->{'args'}->[0]]}]});
+                              'contents' => [$element->{'contents'}->[0]]}]});
           if ($self->{'elements_images'}
               and $self->{'elements_images'}->{$element}) {
             # flush @math, including spaces
@@ -3304,11 +3306,11 @@ sub _convert($$)
         }
         return;
       } elsif ($cmdname eq 'titlefont') {
-        if ($element->{'args'}) {
-          my $result = _text_heading($self,
+        if ($element->{'contents'}) {
+          my $result = _text_heading($self, 
                           {'extra' => {'section_level' => 0},
                            'cmdname' => 'titlefont'},
-                            $element->{'args'}->[0],
+                            $element->{'contents'}->[0],
                             $self->get_conf('NUMBER_SECTIONS'),
           ($self->{'format_context'}->[-1]->{'indent_level'}) *$indent_length);
           $result =~ s/\n$//; # final newline has its own tree element
@@ -3317,10 +3319,11 @@ sub _convert($$)
         }
         return;
       } elsif ($cmdname eq 'U') {
-        if ($element->{'args'}
-            and $element->{'args'}->[0]->{'contents'}
-            and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
-          my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+        if ($element->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}
+            and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+          my $arg_text
+            = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
 
           if (defined($arg_text)) {
             # Syntactic checks on the value were already done in Parser.pm,
@@ -3348,7 +3351,7 @@ sub _convert($$)
         return;
       } elsif ($cmdname eq 'value') {
         my $expansion = $self->cdt('@{No value for `{value}\'@}',
-                                   {'value' => $element->{'args'}->[0]});
+                                   {'value' => $element->{'contents'}->[0]});
         my $piece;
         if ($formatter->{'_top_formatter'}) {
           $piece = {'type' => 'paragraph',
@@ -3750,11 +3753,11 @@ sub _convert($$)
           } elsif ($float->{'extra'}->{'caption'}) {
             $caption = $float->{'extra'}->{'caption'};
           }
-          if ($caption and $caption->{'args'}
-              and $caption->{'args'}->[0]->{'contents'}) {
+          if ($caption and $caption->{'contents'}
+              and $caption->{'contents'}->[0]->{'contents'}) {
             push @{$self->{'context'}}, 'listoffloats';
             $self->{'multiple_pass'} = 1;
-            my $caption_arg = $caption->{'args'}->[0];
+            my $caption_arg = $caption->{'contents'}->[0];
 
             # we do not want to start a new paragraph formatter so
             # we iterate over the contents of a paragraph rather than
@@ -4350,7 +4353,7 @@ sub _convert($$)
         }
         if ($caption) {
           $self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
-          my $tree = $caption->{'args'}->[0];
+          my $tree = $caption->{'contents'}->[0];
           _convert($self, $tree);
         }
       }
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index a8d8b248ea..3488311dc7 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -204,6 +204,12 @@ sub _convert_to_texinfo($)
     if ($element->{'cmdname'}
         or ($element->{'type'} and $element->{'type'} eq 'def_line')) {
       $result .= _expand_cmd_args_to_texi($element);
+      if ($element->{'cmdname'}
+          and (exists($brace_commands{$element->{'cmdname'}})
+               or ($element->{'type'}
+                   and $element->{'type'} eq 'definfoenclose_command'))) {
+        return $result;
+      }
     } else {
       if ($element->{'type'}
           and ($element->{'type'} eq 'bracketed_arg'
@@ -257,16 +263,6 @@ sub _expand_cmd_args_to_texi($) {
       if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
     $result .= $cmd->{'info'}->{'arg_line'};
   } elsif ($cmd->{'args'}) {
-    my $braces;
-    $braces = 1 if (scalar(@{$cmd->{'args'}})
-                    and ($cmd->{'args'}->[0]->{'type'}
-                          and ($cmd->{'args'}->[0]->{'type'} eq 
'brace_container'
-                               or $cmd->{'args'}->[0]->{'type'} eq 'brace_arg'
-                               or $cmd->{'args'}->[0]->{'type'} eq 
'brace_command_context')));
-    $result .= '{' if ($braces);
-    if ($cmdname eq 'verb') {
-      $result .= $cmd->{'info'}->{'delimiter'};
-    }
     $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
        if ($cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'});
     my $with_commas = 0;
@@ -274,9 +270,7 @@ sub _expand_cmd_args_to_texi($) {
          # block line commands with arguments not separated by commas
          and not ($def_commands{$cmdname}
                   or $block_commands{$cmdname} eq 'multitable'))
-        or $cmdname eq 'node'
-        or exists($brace_commands{$cmdname})
-        or ($cmd->{'type'} and $cmd->{'type'} eq 'definfoenclose_command')) {
+        or $cmdname eq 'node') {
       $with_commas = 1;
     }
     my $arg_nr = 0;
@@ -288,6 +282,32 @@ sub _expand_cmd_args_to_texi($) {
       }
       $result .= _convert_to_texinfo($arg);
     }
+   # TODO consider moving the braces command code to _convert_to_texinfo.
+   # Would require changing conditions on calling _expand_cmd_args_to_texi
+   # and adding commas for contents in _convert_to_texinfo
+  } elsif ($cmd->{'contents'}
+           and (exists($brace_commands{$cmdname})
+                or ($cmd->{'type'}
+                    and $cmd->{'type'} eq 'definfoenclose_command'))) {
+    my $braces;
+    $braces = 1 if (scalar(@{$cmd->{'contents'}})
+                    and ($cmd->{'contents'}->[0]->{'type'}
+                          and ($cmd->{'contents'}->[0]->{'type'} eq 
'brace_container'
+                               or $cmd->{'contents'}->[0]->{'type'} eq 
'brace_arg'
+                               or $cmd->{'contents'}->[0]->{'type'} eq 
'brace_command_context')));
+    $result .= '{' if ($braces);
+    if ($cmdname eq 'verb') {
+      $result .= $cmd->{'info'}->{'delimiter'};
+    }
+    $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
+       if ($cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'});
+    my $arg_nr = 0;
+    foreach my $arg (@{$cmd->{'contents'}}) {
+      next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
+      $result .= ',' if ($arg_nr);
+      $arg_nr++;
+      $result .= _convert_to_texinfo($arg);
+    }
     if ($cmdname eq 'verb') {
       $result .= $cmd->{'info'}->{'delimiter'};
     }
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 3eccc5d51e..fc39fb34cb 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -721,7 +721,7 @@ sub _convert($$;$)
       }
       if ($self->{'itemize_command_as_argument'}
           and $element eq $self->{'itemize_command_as_argument'}
-          and !$element->{'args'}) {
+          and !$element->{'contents'}) {
         my $arguments = [['command', $element->{'cmdname'}]];
         push @$arguments, ['automatic', 'on']
           if ($element->{'info'} and $element->{'info'}->{'inserted'});
@@ -734,17 +734,17 @@ sub _convert($$;$)
       } else {
         my $attributes = [];
         my $arg;
-        if (!$element->{'args'}) {
+        if (!$element->{'contents'}) {
           $arg = '';
         } else {
-          $arg = $self->_convert($element->{'args'}->[0]);
+          $arg = $self->_convert($element->{'contents'}->[0]);
           if ($element->{'info'}
               and $element->{'info'}->{'spaces_after_cmd_before_arg'}) {
             push @$attributes, ['spacesaftercmd',
                $element->{'info'}->{'spaces_after_cmd_before_arg'}->{'text'}];
           }
-          if ($element->{'args'}->[0]->{'type'} ne 'brace_container'
-              and $element->{'args'}->[0]->{'type'} ne 'brace_arg') {
+          if ($element->{'contents'}->[0]->{'type'} ne 'brace_container'
+              and $element->{'contents'}->[0]->{'type'} ne 'brace_arg') {
             push @$attributes, ['bracketed', 'off'];
           }
         }
@@ -925,9 +925,11 @@ sub _convert($$;$)
                 push @$attributes, ['automatic', 'on'];
 
                 if (defined($node_direction->{'extra'}->{'normalized'})) {
+                  my $label_element
+                    = Texinfo::Common::get_label_element($node_direction);
                   $node_name .= Texinfo::Common::normalize_top_node_name(
                     $self->_convert({'contents'
-                             => 
$node_direction->{'args'}->[0]->{'contents'}}));
+                             => $label_element->{'contents'}}));
                 }
               } else {
                 $node_name
@@ -1113,16 +1115,16 @@ sub _convert($$;$)
       push @{$self->{'document_context'}->[-1]->{'monospace'}},
         $in_monospace_not_normal
           if (defined($in_monospace_not_normal));
-      my $arg = $self->_convert($element->{'args'}->[0]);
+      my $arg = $self->_convert($element->{'contents'}->[0]);
       pop @{$self->{'document_context'}->[-1]->{'monospace'}}
         if (defined($in_monospace_not_normal));
       my $command_result = $self->txi_markup_open_element('infoenclose',
                                           [['command', $element->{'cmdname'}],
                                        
$self->_infoenclose_attribute($element)])
-                 .$arg.$self->_convert_comment_at_end($element->{'args'}->[0]).
+             .$arg.$self->_convert_comment_at_end($element->{'contents'}->[0]).
                  $self->txi_markup_close_element('infoenclose');
       return $command_result;
-    } elsif ($element->{'args'}
+    } elsif ($element->{'contents'}
              and exists($brace_commands{$element->{'cmdname'}})) {
 
       if ($Texinfo::Commands::inline_format_commands{$element->{'cmdname'}}
@@ -1133,12 +1135,12 @@ sub _convert($$;$)
           $self->{'document_context'}->[-1]->{'raw'} = 1;
         }
         my $command_result = '';
-        if (scalar(@{$element->{'args'}}) >= 2
-              and defined($element->{'args'}->[1])
-              and $element->{'args'}->[1]->{'contents'}
-              and scalar(@{$element->{'args'}->[1]->{'contents'}})) {
+        if (scalar(@{$element->{'contents'}}) >= 2
+              and defined($element->{'contents'}->[1])
+              and $element->{'contents'}->[1]->{'contents'}
+              and scalar(@{$element->{'contents'}->[1]->{'contents'}})) {
           $command_result = $self->_convert({'contents'
-                                         => [$element->{'args'}->[1]]});
+                                         => [$element->{'contents'}->[1]]});
         }
         if ($element->{'cmdname'} eq 'inlineraw') {
           pop @{$self->{'document_context'}};
@@ -1197,11 +1199,11 @@ sub _convert($$;$)
       my $args_or_one_arg_cmd = '';
       my $arg_index = 0;
       foreach my $format_element (@format_elements) {
-        if (defined($element->{'args'}->[$arg_index])) {
+        if (defined($element->{'contents'}->[$arg_index])) {
           # Leading spaces are gathered here except for context brace_commands
           # (gathered just above).
           push @$attribute,
-            _leading_spaces_arg($element->{'args'}->[$arg_index]);
+            _leading_spaces_arg($element->{'contents'}->[$arg_index]);
           my $in_monospace_not_normal;
           if (defined($default_args_code_style{$element->{'cmdname'}})
               and 
$default_args_code_style{$element->{'cmdname'}}->[$arg_index]) {
@@ -1213,16 +1215,16 @@ sub _convert($$;$)
           push @{$self->{'document_context'}->[-1]->{'monospace'}},
             $in_monospace_not_normal
               if (defined($in_monospace_not_normal));
-          my $arg = $self->_convert($element->{'args'}->[$arg_index]);
+          my $arg = $self->_convert($element->{'contents'}->[$arg_index]);
           my $comment_at_end
-            = $self->_convert_comment_at_end($element->{'args'}->[$arg_index]);
+            = 
$self->_convert_comment_at_end($element->{'contents'}->[$arg_index]);
           pop @{$self->{'document_context'}->[-1]->{'monospace'}}
             if (defined($in_monospace_not_normal));
 
-          if ($element->{'args'}->[$arg_index]->{'info'}
-              and $element->{'args'}->[$arg_index]
+          if ($element->{'contents'}->[$arg_index]->{'info'}
+              and $element->{'contents'}->[$arg_index]
                                       ->{'info'}->{'spaces_after_argument'}) {
-            $arg .= $element->{'args'}->[$arg_index]
+            $arg .= $element->{'contents'}->[$arg_index]
                    ->{'info'}->{'spaces_after_argument'}->{'text'};
           }
 
@@ -1268,9 +1270,9 @@ sub _convert($$;$)
           push @$attribute, ['where', 'inline'];
         }
       } elsif ($Texinfo::Commands::ref_commands{$element->{'cmdname'}}) {
-        if ($element->{'args'}) {
+        if ($element->{'contents'}) {
           my $normalized;
-          my $node_arg = $element->{'args'}->[0];
+          my $node_arg = $element->{'contents'}->[0];
           if ($node_arg and $node_arg->{'extra'}
               and $node_arg->{'extra'}->{'node_content'}) {
             my $normalized;
@@ -1291,16 +1293,16 @@ sub _convert($$;$)
                 or $element->{'cmdname'} eq 'inforef') {
             $manual_arg_index = 2;
           }
-          if (defined($element->{'args'}->[$manual_arg_index])
-              and $element->{'args'}->[$manual_arg_index]->{'contents'}
-              and @{$element->{'args'}->[$manual_arg_index]->{'contents'}}) {
+          if (defined($element->{'contents'}->[$manual_arg_index])
+              and $element->{'contents'}->[$manual_arg_index]->{'contents'}
+              and 
@{$element->{'contents'}->[$manual_arg_index]->{'contents'}}) {
 
             Texinfo::Convert::Text::set_options_code(
                                  $self->{'convert_text_options'});
             Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
                                   $self->{'convert_text_options'});
             $manual = Texinfo::Convert::Text::convert_to_text(
-                                    $element->{'args'}->[$manual_arg_index],
+                               $element->{'contents'}->[$manual_arg_index],
                                    $self->{'convert_text_options'});
             Texinfo::Convert::Text::reset_options_encoding(
                                  $self->{'convert_text_options'});
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 8cf8df1fbb..f9fbc01986 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -25,6 +25,9 @@ package Texinfo::Convert::TexinfoXML;
 use 5.006;
 use strict;
 
+# check that autovivification do not happen incorrectly.
+#no autovivification qw(fetch delete exists store strict);
+
 use Carp qw(cluck);
 
 use Texinfo::Convert::TexinfoMarkup;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 22e0387394..063354c934 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -77,8 +77,10 @@ sub import {
 }
 
 
-# this is in fact not needed for 'footnote', 'shortcaption', 'caption'
+# this may not be needed for 'footnote', 'shortcaption', 'caption'
 # as they have no brace_container, see below.
+# FIXME check that the above sentence is still true now that the brace
+# commands have contents and not args
 my %ignored_brace_commands;
 foreach my $ignored_brace_command (#'xref','ref','pxref','inforef',
    'anchor', 'sortas', 'seealso', 'seeentry',
@@ -587,38 +589,38 @@ sub _convert($$)
                                 $options->{'set_case'});
       return $result;
     } elsif ($cmdname eq 'image') {
-      if ($element->{'args'}) {
+      if ($element->{'contents'}) {
         $options->{'_code_state'}++;
-        my $text = _convert($options, $element->{'args'}->[0]);
+        my $text = _convert($options, $element->{'contents'}->[0]);
         $options->{'_code_state'}--;
         return $text;
       } else {
         return '';
       }
     } elsif ($cmdname eq 'email') {
-      if ($element->{'args'}) {
+      if ($element->{'contents'}) {
         my $text;
-        $text = _convert($options, $element->{'args'}->[1])
-           if (defined($element->{'args'}->[1]));
+        $text = _convert($options, $element->{'contents'}->[1])
+           if (defined($element->{'contents'}->[1]));
         return $text if (defined($text) and ($text ne ''));
         $options->{'_code_state'}++;
-        my $mail = _convert($options, $element->{'args'}->[0]);
+        my $mail = _convert($options, $element->{'contents'}->[0]);
         $options->{'_code_state'}--;
         return $mail;
       } else {
         return '';
       }
     } elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
-      if ($element->{'args'}) {
+      if ($element->{'contents'}) {
         my $replacement;
-        $replacement = _convert($options, $element->{'args'}->[2])
-          if (defined($element->{'args'}->[2]));
+        $replacement = _convert($options, $element->{'contents'}->[2])
+          if (defined($element->{'contents'}->[2]));
         return $replacement if (defined($replacement) and $replacement ne '');
         my $text;
-        $text = _convert($options, $element->{'args'}->[1])
-          if (defined($element->{'args'}->[1]));
+        $text = _convert($options, $element->{'contents'}->[1])
+          if (defined($element->{'contents'}->[1]));
         $options->{'_code_state'}++;
-        my $url = _convert($options, $element->{'args'}->[0]);
+        my $url = _convert($options, $element->{'contents'}->[0]);
         $options->{'_code_state'}--;
         if (defined($text) and $text ne '') {
           return "$url ($text)";
@@ -631,12 +633,14 @@ sub _convert($$)
     # if there is only one argument, it is processed below with the other
     # brace commands
     } elsif ($Texinfo::Commands::explained_commands{$cmdname}
-             and $element->{'args'} and scalar(@{$element->{'args'}}) >= 2) {
-      my $explanation = _convert($options, $element->{'args'}->[1]);
+             and $element->{'contents'}
+             and scalar(@{$element->{'contents'}}) >= 2) {
+      my $explanation = _convert($options, $element->{'contents'}->[1]);
       if ($explanation ne '') {
-        return _convert($options, $element->{'args'}->[0]) ." ($explanation)";
+        return _convert($options, $element->{'contents'}->[0])
+                                             ." ($explanation)";
       } else {
-        return _convert($options, $element->{'args'}->[0]);
+        return _convert($options, $element->{'contents'}->[0]);
       }
     } elsif ($Texinfo::Commands::brace_commands{$cmdname}
              and $Texinfo::Commands::brace_commands{$cmdname} eq 'inline') {
@@ -653,17 +657,17 @@ sub _convert($$)
         $arg_index = 2;
       }
       my $result = '';
-      if (scalar(@{$element->{'args'}}) > $arg_index) {
-        $result = _convert($options, $element->{'args'}->[$arg_index]);
+      if (scalar(@{$element->{'contents'}}) > $arg_index) {
+        $result = _convert($options, $element->{'contents'}->[$arg_index]);
       }
       if ($cmdname eq 'inlineraw') {
         $options->{'_raw_state'}--;
       }
       return $result;
-    } elsif ($element->{'args'}
-           and (($element->{'args'}->[0]->{'type'}
-                and ($element->{'args'}->[0]->{'type'} eq 'brace_container'
-                     or $element->{'args'}->[0]->{'type'} eq 'brace_arg'))
+    } elsif ($element->{'contents'}
+           and (($element->{'contents'}->[0]->{'type'}
+                and ($element->{'contents'}->[0]->{'type'} eq 'brace_container'
+                     or $element->{'contents'}->[0]->{'type'} eq 'brace_arg'))
                 or ($Texinfo::Commands::math_commands{$cmdname}
                     and $Texinfo::Commands::brace_commands{$cmdname}))) {
       my $result;
@@ -674,7 +678,7 @@ sub _convert($$)
         $in_code = 1;
       }
       $options->{'_code_state'}++ if ($in_code);
-      $result = _convert($options, $element->{'args'}->[0]);
+      $result = _convert($options, $element->{'contents'}->[0]);
       $options->{'_code_state'}-- if ($in_code);
       $options->{'set_case'}-- if ($cmdname eq 'sc');
       return $result;
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index da0bc3e0d0..d561f94761 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -295,7 +295,7 @@ sub definition_category_tree($$)
     my $brace_arg
       = {'type' => 'brace_container', 'contents' => [$arg_class],
          'parent' => $arg_class_code};
-    $arg_class_code->{'args'} = [$brace_arg];
+    $arg_class_code->{'contents'} = [$brace_arg];
   }
 
   my $def_command = $current->{'extra'}->{'def_command'};
@@ -357,10 +357,10 @@ sub find_innermost_accent_contents($)
     }
     push @accent_commands, $current;
     # A bogus accent, that may happen
-    if (!$current->{'args'}) {
+    if (!$current->{'contents'}) {
       return (undef, \@accent_commands);
     }
-    my $arg = $current->{'args'}->[0];
+    my $arg = $current->{'contents'}->[0];
     if (!$arg->{'contents'}) {
       return (undef, \@accent_commands);
     }
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index 4ee88b1060..eb3d97c190 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -542,8 +542,9 @@ sub _idx_leading_text_or_command($$)
               or $cmdname eq 'U') {
             return (undef, $content);
           } elsif ($brace_command_type ne 'inline') {
-            if ($content->{'args'} and scalar(@{$content->{'args'}})) {
-              return _idx_leading_text_or_command($content->{'args'}->[0],
+            if ($content->{'contents'}
+                and scalar(@{$content->{'contents'}})) {
+              return _idx_leading_text_or_command($content->{'contents'}->[0],
                                                   $ignore_chars);
             }
           } else {
diff --git a/tp/Texinfo/ManipulateTree.pm b/tp/Texinfo/ManipulateTree.pm
index aa51345bde..86f038a44a 100644
--- a/tp/Texinfo/ManipulateTree.pm
+++ b/tp/Texinfo/ManipulateTree.pm
@@ -420,13 +420,13 @@ sub _new_asis_command_with_text($$;$)
   my $parent = shift;
   my $text_type = shift;
   my $new_command = {'cmdname' => 'asis', 'parent' => $parent };
-  push @{$new_command->{'args'}}, {'type' => 'brace_container',
+  push @{$new_command->{'contents'}}, {'type' => 'brace_container',
                                    'parent' => $new_command};
-  push @{$new_command->{'args'}->[0]->{'contents'}}, {
+  push @{$new_command->{'contents'}->[0]->{'contents'}}, {
     'text' => $text,
-    'parent' => $new_command->{'args'}->[0]};
+    'parent' => $new_command->{'contents'}->[0]};
   if (defined($text_type)) {
-    $new_command->{'args'}->[0]->{'contents'}->[0]->{'type'} = $text_type;
+    $new_command->{'contents'}->[0]->{'contents'}->[0]->{'type'} = $text_type;
   }
   return $new_command;
 }
@@ -469,7 +469,7 @@ sub _protect_text($$)
             my $e = {'cmdname' => 'comma', 'parent' => $current->{'parent'}};
             my $brace_container = {'type' => 'brace_container',
                                    'parent' => $e};
-            $e->{'args'} = [$brace_container];
+            $e->{'contents'} = [$brace_container];
             $current_position = Texinfo::Common::relocate_source_marks(
                                           $remaining_source_marks, $e,
                                           $current_position, 1);
@@ -478,7 +478,7 @@ sub _protect_text($$)
         } else {
           my $new_asis = _new_asis_command_with_text($2, $current->{'parent'},
                                                     $current->{'type'});
-          my $e = $new_asis->{'args'}->[0]->{'contents'}->[0];
+          my $e = $new_asis->{'contents'}->[0]->{'contents'}->[0];
           $current_position = Texinfo::Common::relocate_source_marks(
                                           $remaining_source_marks, $e,
                                           $current_position, length($2));
@@ -559,7 +559,7 @@ sub protect_first_parenthesis($)
       }
       my $new_asis = _new_asis_command_with_text('(', $content->{'parent'},
                                                  $content->{'type'});
-      my $e = $new_asis->{'args'}->[0]->{'contents'}->[0];
+      my $e = $new_asis->{'contents'}->[0]->{'contents'}->[0];
       $current_position = Texinfo::Common::relocate_source_marks(
                                        $remaining_source_marks, $e,
                                        $current_position, length('('));
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 7f5c62c96a..1cacb503aa 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1147,6 +1147,7 @@ sub _bug_message($$;$$)
 }
 
 # for debugging
+# TODO probably useless now that args are contents
 sub _print_command_args_texi($)
 {
   my $current = shift;
@@ -4332,7 +4333,7 @@ sub _end_line_starting_block($$$)
       # if the command as argument does not have braces but it is
       # not a mark (noarg) command, warn
       if (defined($command_as_argument)
-          and !$command_as_argument->{'args'}
+          and !$command_as_argument->{'contents'}
           and $brace_commands{$command_as_argument->{'cmdname'}} ne 'noarg') {
         my $cmdname = $command_as_argument->{'cmdname'};
         $self->_command_warn($current, __("\@%s expected braces"),
@@ -5162,11 +5163,11 @@ sub _new_value_element($$;$$)
   my $spaces_element = shift;
 
   my $value_elt = { 'cmdname' => $command,
-                      'args' => [] };
+                      'contents' => [] };
   $value_elt->{'parent'} = $current if (defined($current));
   my $brace_container = {'type' => 'brace_container',
                          'contents' => [], 'parent' => $value_elt};
-  push @{$value_elt->{'args'}}, $brace_container;
+  push @{$value_elt->{'contents'}}, $brace_container;
   push @{$brace_container->{'contents'}}, {'text' => $flag,
                                            'parent' => $brace_container};
   if ($spaces_element) {
@@ -6233,7 +6234,7 @@ sub _handle_open_brace($$$$)
     }
 
     my $arg = {'parent' => $current};
-    $current->{'args'} = [$arg];
+    $current->{'contents'} = [$arg];
     $current = $arg;
     push @{$self->{'nesting_context'}->{'basic_inline_stack'}}, $command
       if ($self->{'basic_inline_commands'}
@@ -6455,7 +6456,7 @@ sub _handle_close_brace($$$)
     } elsif ($ref_commands{$closed_cmdname}) {
       my $ref = $brace_command;
       my @args;
-      for $a (@{$ref->{'args'}}) {
+      for $a (@{$ref->{'contents'}}) {
         if ($a->{'contents'}) {
           push @args, $a->{'contents'};
         } else {
@@ -6474,7 +6475,7 @@ sub _handle_close_brace($$$)
            "command \@%s missing a node or external manual argument"),
                               $closed_cmdname), $source_info);
       } else {
-        my $arg_label = $ref->{'args'}->[0];
+        my $arg_label = $ref->{'contents'}->[0];
         my $ref_label_info
           = Texinfo::Common::parse_node_manual($arg_label, 1);
         if (defined($ref_label_info)) {
@@ -6515,7 +6516,7 @@ sub _handle_close_brace($$$)
       }
     } elsif ($closed_cmdname eq 'image') {
       my $image = $brace_command;
-      if (!$image->{'args'}->[0]->{'contents'}) {
+      if (!$image->{'contents'}->[0]->{'contents'}) {
         $self->_line_error(
            __("\@image missing filename argument"), $source_info);
       }
@@ -6540,7 +6541,7 @@ sub _handle_close_brace($$$)
     } elsif ($explained_commands{$closed_cmdname}
              or ($brace_commands{$closed_cmdname}
                  and $brace_commands{$closed_cmdname} eq 'inline')) {
-      if (!$brace_command->{'args'}->[0]->{'contents'}) {
+      if (!$brace_command->{'contents'}->[0]->{'contents'}) {
         $self->_line_warn(
            sprintf(__("\@%s missing first argument"),
                    $closed_cmdname), $source_info);
@@ -6665,15 +6666,15 @@ sub _handle_comma($$$$)
   #                          and $type ne 'brace_arg'
   #                          and $type ne 'block_line_arg'
   #                          and $type ne 'line_arg');
-  my $brace_command = $current->{'parent'};
+  my $command_element = $current->{'parent'};
 
-  $brace_command->{'remaining_args'}--;
+  $command_element->{'remaining_args'}--;
 
-  if ($brace_commands{$brace_command->{'cmdname'}}
-      and $brace_commands{$brace_command->{'cmdname'}} eq 'inline') {
+  if ($brace_commands{$command_element->{'cmdname'}}
+      and $brace_commands{$command_element->{'cmdname'}} eq 'inline') {
     my $expandp = 0;
-    $brace_command->{'extra'} = {} if (!$brace_command->{'extra'});
-    if (! $brace_command->{'extra'}->{'format'}) {
+    $command_element->{'extra'} = {} if (!$command_element->{'extra'});
+    if (! $command_element->{'extra'}->{'format'}) {
       my $inline_type;
       # get the first argument, which is also $current, which was before the 
comma
       # and put it in extra format
@@ -6687,33 +6688,33 @@ sub _handle_comma($$$$)
           if ($self->{'conf'}->{'DEBUG'});
       } else {
         print STDERR "INLINE: $inline_type\n" if ($self->{'conf'}->{'DEBUG'});
-        if ($inline_format_commands{$brace_command->{'cmdname'}}) {
+        if ($inline_format_commands{$command_element->{'cmdname'}}) {
           if ($self->{'expanded_formats_hash'}->{$inline_type}) {
             $expandp = 1;
-            $brace_command->{'extra'}->{'expand_index'} = 1;
+            $command_element->{'extra'}->{'expand_index'} = 1;
           } else {
             $expandp = 0;
           }
-        } elsif (($brace_command->{'cmdname'} eq 'inlineifset'
+        } elsif (($command_element->{'cmdname'} eq 'inlineifset'
                   and exists($self->{'values'}->{$inline_type}))
-                 or ($brace_command->{'cmdname'} eq 'inlineifclear'
+                 or ($command_element->{'cmdname'} eq 'inlineifclear'
                      and ! exists($self->{'values'}->{$inline_type}))) {
           $expandp = 1;
-          $brace_command->{'extra'}->{'expand_index'} = 1;
+          $command_element->{'extra'}->{'expand_index'} = 1;
         } else {
           $expandp = 0;
         }
       }
-      $brace_command->{'extra'}->{'format'} = $inline_type;
+      $command_element->{'extra'}->{'format'} = $inline_type;
 
       # Skip first argument for a false @inlinefmtifelse
-      if (!$expandp and $brace_command->{'cmdname'} eq 'inlinefmtifelse') {
-        $brace_command->{'extra'}->{'expand_index'} = 2;
+      if (!$expandp and $command_element->{'cmdname'} eq 'inlinefmtifelse') {
+        $command_element->{'extra'}->{'expand_index'} = 2;
 
         my $elided_arg_elt = {'type' => 'elided_brace_command_arg',
                               'contents' => [],
-                              'parent' => $brace_command,};
-        push @{$brace_command->{'args'}}, $elided_arg_elt;
+                              'parent' => $command_element,};
+        push @{$command_element->{'contents'}}, $elided_arg_elt;
         my $arg_text_e = {'type' => 'raw', 'text' => '',
                           'parent' => $elided_arg_elt};
         push @{$elided_arg_elt->{'contents'}}, $arg_text_e;
@@ -6727,7 +6728,7 @@ sub _handle_comma($$$$)
             my $delimiter = $2;
             if ($delimiter eq ',') {
               if ($brace_count == 1) {
-                $brace_command->{'remaining_args'}--;
+                $command_element->{'remaining_args'}--;
                 last;
               }
               $arg_text_e->{'text'} .= $delimiter;
@@ -6762,7 +6763,7 @@ sub _handle_comma($$$$)
         # when condition is false.  Keep it.
         $expandp = 1;
       }
-    } elsif ($brace_command->{'cmdname'} eq 'inlinefmtifelse') {
+    } elsif ($command_element->{'cmdname'} eq 'inlinefmtifelse') {
       # Second part of @inlinefmtifelse (not counting the format) when
       # condition is true. Discard second part.
       $expandp = 0;
@@ -6772,8 +6773,8 @@ sub _handle_comma($$$$)
     if (!$expandp) {
       my $elided_arg_elt = {'type' => 'elided_brace_command_arg',
                             'contents' => [],
-                            'parent' => $brace_command,};
-      push @{$brace_command->{'args'}}, $elided_arg_elt;
+                            'parent' => $command_element,};
+      push @{$command_element->{'contents'}}, $elided_arg_elt;
       my $arg_text_e = {'type' => 'raw', 'text' => '',
                         'parent' => $elided_arg_elt};
       push @{$elided_arg_elt->{'contents'}}, $arg_text_e;
@@ -6811,8 +6812,13 @@ sub _handle_comma($$$$)
       # goto funexit;  # used in XS code
     }
   }
-  my $new_arg = {'type' => $type, 'parent' => $brace_command, 'contents' => 
[]};
-  push @{$brace_command->{'args'}}, $new_arg;
+  my $new_arg = {'type' => $type, 'parent' => $command_element,
+                 'contents' => []};
+  if ($brace_commands{$command_element->{'cmdname'}}) {
+    push @{$command_element->{'contents'}}, $new_arg;
+  } else {
+    push @{$command_element->{'args'}}, $new_arg;
+  }
   # internal_spaces_before_argument is a transient internal type,
   # which should end up in info spaces_before_argument.
   my $space_before = {'type' => 'internal_spaces_before_argument',
@@ -7335,7 +7341,7 @@ sub _process_remaining_on_line($$$$)
         if ($self->{'conf'}->{'DEBUG'});
       my $following_arg = {'type' => 'following_arg',
                            'parent' => $current};
-      $current->{'args'} = [ $following_arg ];
+      $current->{'contents'} = [ $following_arg ];
       my $accent_arg = { 'text' => $arg_char, 'parent' => $following_arg };
       $following_arg->{'contents'} = [ $accent_arg ];
 
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 5a13911d8f..feef206072 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -542,9 +542,9 @@ sub check_nodes_are_referenced($)
   # consider nodes in internal @*ref commands to be referenced
   if (defined($refs)) {
     foreach my $ref (@$refs) {
-      if ($ref->{'args'} and scalar(@{$ref->{'args'}})
-          and $ref->{'args'}->[0]->{'extra'}) {
-        my $label_arg = $ref->{'args'}->[0];
+      if ($ref->{'contents'} and scalar(@{$ref->{'contents'}})
+          and $ref->{'contents'}->[0]->{'extra'}) {
+        my $label_arg = $ref->{'contents'}->[0];
         my $label_normalized = $label_arg->{'extra'}->{'normalized'};
         if ($label_normalized) {
           my $node_target = $identifier_target->{$label_normalized};
@@ -1064,7 +1064,7 @@ sub associate_internal_references($)
     if ($ref->{'type'} and $ref->{'type'} eq 'menu_entry_node') {
       $label_element = $ref;
     } else {
-      $label_element = $ref->{'args'}->[0];
+      $label_element = $ref->{'contents'}->[0];
     }
 
     if ($label_element->{'extra'}
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 90d2fb512e..a64867c58f 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -185,8 +185,8 @@ sub fill_gaps_in_sectioning($;$)
         } else {
           my $asis_command = {'cmdname' => 'asis',
                               'parent' => $line_arg};
-          $asis_command->{'args'} = [{'type' => 'brace_container',
-                                      'parent' => $asis_command}];
+          $asis_command->{'contents'} = [{'type' => 'brace_container',
+                                          'parent' => $asis_command}];
           $line_content = $asis_command;
         }
         $line_arg->{'contents'} = [$line_content];
@@ -233,7 +233,7 @@ sub _reference_to_arg($$$)
 
   if ($current->{'cmdname'} and
       $Texinfo::Commands::ref_commands{$current->{'cmdname'}}
-      and $current->{'args'}) {
+      and $current->{'contents'}) {
 
     # remove from internal references
     if ($document) {
@@ -249,8 +249,8 @@ sub _reference_to_arg($$$)
       @args_try_order = (0, 1, 2, 4, 3);
     }
     foreach my $index (@args_try_order) {
-      if (defined($current->{'args'}->[$index])) {
-        my $arg = $current->{'args'}->[$index];
+      if (defined($current->{'contents'}->[$index])) {
+        my $arg = $current->{'contents'}->[$index];
         # this will not detect if the arg expands as spaces only, like
         # @asis{ }, @ , but it is not an issue or could even be considered
         # as a feature.
@@ -903,7 +903,7 @@ sub _protect_hashchar_at_line_beginning($$$)
 
             $e = {'cmdname' => 'hashchar', 'parent' => $parent};
             my $arg = {'type' => 'brace_container', 'parent' => $e};
-            $e->{'args'} = [$arg];
+            $e->{'contents'} = [$arg];
             $current_position = Texinfo::Common::relocate_source_marks(
                                           $remaining_source_marks, $e,
                                           $current_position, 1);
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 700ae1f13f..357face89d 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -365,7 +365,7 @@ sub _substitute_element_array($$) {
     if (!defined($element->{'text'})) {
       if ($element->{'cmdname'}
           and $element->{'cmdname'} eq 'txiinternalvalue') {
-        my $name = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+        my $name = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
         if ($replaced_substrings->{$name}) {
           $array->[$idx] = $replaced_substrings->{$name};
         }
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 7ed4085b8f..c0a38c591f 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -904,9 +904,10 @@ html_prepare_converted_output_info (CONVERTER *self, const 
char *output_file,
 
   if (!fulltitle_tree
       && self->document->global_commands.titlefont.number > 0
-      && self->document->global_commands.titlefont.list[0]->e.c->args.number > 0
-      && self->document->global_commands.titlefont.list[0]->e.c->args.list[0]
-                                    ->e.c->contents.number > 0)
+      && self->document->global_commands.titlefont.list[0]
+                                           ->e.c->contents.number > 0
+      && self->document->global_commands.titlefont.list[0]
+                  ->e.c->contents.list[0]->e.c->contents.number > 0)
     {
       fulltitle_tree = self->document->global_commands.titlefont.list[0];
     }
@@ -1277,12 +1278,12 @@ html_convert_tree_append (CONVERTER *self, const 
ELEMENT *element,
           text_init (&content_formatted);
           text_append (&content_formatted, "");
 
-          if (element->e.c->contents.number > 0)
+          if (element->e.c->contents.number > 0
+              && !(builtin_command_data[data_cmd].flags & CF_brace))
             {
 
-              if (convert_to_latex
-                  && !(builtin_command_data[data_cmd].flags & CF_brace))
-                {
+              if (convert_to_latex)
+                { /* displaymath */
                   ELEMENT *tmp = new_element (ET_NONE);
                   char *latex_content;
 
@@ -1329,26 +1330,39 @@ html_convert_tree_append (CONVERTER *self, const 
ELEMENT *element,
               || cmd == CM_float
               || cmd == CM_cartouche)
             {
-              if (element->e.c->args.number > 0)
+              const ELEMENT_LIST *arguments_list = 0;
+
+              if (builtin_command_data[data_cmd].flags & CF_brace)
+                {
+                  if (element->e.c->contents.number > 0)
+                    arguments_list = &element->e.c->contents;
+                }
+              else
+                {
+                  if (element->e.c->args.number > 0)
+                    arguments_list = &element->e.c->args;
+                }
+
+              if (arguments_list)
                 {
-                  TEXT formatted_arg;
                   size_t arg_idx;
+                  TEXT formatted_arg;
 
                   text_init (&formatted_arg);
 
                   args_formatted = (HTML_ARGS_FORMATTED *)
                     malloc (sizeof (HTML_ARGS_FORMATTED));
-                  args_formatted->number = element->e.c->args.number;
+                  args_formatted->number = arguments_list->number;
                   args_formatted->args = (HTML_ARG_FORMATTED *)
                  malloc (args_formatted->number * sizeof (HTML_ARG_FORMATTED));
                   memset (args_formatted->args, 0,
                         args_formatted->number * sizeof (HTML_ARG_FORMATTED));
 
-                  for (arg_idx = 0; arg_idx < element->e.c->args.number; 
arg_idx++)
+                  for (arg_idx = 0; arg_idx < arguments_list->number; 
arg_idx++)
                     {
                       char *explanation;
                       unsigned long arg_flags = 0;
-                      const ELEMENT *arg = element->e.c->args.list[arg_idx];
+                      const ELEMENT *arg = arguments_list->list[arg_idx];
                       HTML_ARG_FORMATTED *arg_formatted
                          = &args_formatted->args[arg_idx];
 
@@ -1583,9 +1597,9 @@ html_convert_tree_append (CONVERTER *self, const ELEMENT 
*element,
 
       if (type == ET_definfoenclose_command)
         {
-          if (element->e.c->args.number > 0)
+          if (element->e.c->contents.number > 0)
             {
-              html_convert_tree_append (self, element->e.c->args.list[0],
+              html_convert_tree_append (self, element->e.c->contents.list[0],
                                         &content_formatted,
                                         "DEFINFOENCLOSE_ARG");
             }
@@ -2802,9 +2816,10 @@ html_node_redirections (CONVERTER *self,
                     {
                       const ELEMENT *conflicting_node
                         = file_source_info->element;
+                      const ELEMENT *label_element
+                        = get_label_element (conflicting_node);
                       char *node_texi
-                        = convert_contents_to_texinfo
-                                        (conflicting_node->e.c->args.list[0]);
+                        = convert_contents_to_texinfo (label_element);
                       pmessage_list_command_warn (&self->error_messages,
                                         self->conf, conflicting_node, 1,
                 "conflict of redirection file with file based on node name",
@@ -2817,9 +2832,10 @@ html_node_redirections (CONVERTER *self,
                     {
                       const ELEMENT *conflicting_node
                         = file_source_info->element;
+                      const ELEMENT *label_element
+                        = get_label_element (conflicting_node);
                       char *node_texi
-                        = convert_contents_to_texinfo
-                                        (conflicting_node->e.c->args.list[0]);
+                        = convert_contents_to_texinfo (label_element);
                       message_list_command_warn (&self->error_messages,
                                         self->conf, conflicting_node, 1,
                              "conflict with @%s `%s' redirection file",
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 333d93d04c..3613755303 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -1393,7 +1393,7 @@ table_item_content_tree (CONVERTER *self, const ELEMENT 
*element)
           arg = new_element_added (tree, ET_brace_container);
           add_to_contents_as_array (arg, element->e.c->args.list[0]);
         }
-      add_to_element_args (command, arg);
+      add_to_element_contents (command, arg);
       return tree;
     }
   return 0;
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index cb58a4a3a2..e5134882b7 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -1786,7 +1786,12 @@ html_internal_command_tree (CONVERTER *self, const 
ELEMENT *command,
                    || command->e.c->cmd == CM_anchor)
             {
               ELEMENT *root_code = new_element_added (tree, ET__code);
-              add_to_contents_as_array (root_code, command->e.c->args.list[0]);
+              ELEMENT *label_element;
+              if (command->e.c->cmd == CM_anchor)
+                label_element = command->e.c->contents.list[0];
+              else
+                label_element = command->e.c->args.list[0];
+              add_to_contents_as_array (root_code, label_element);
               tree->tree = root_code;
               add_tree_to_build (self, tree->tree);
             }
@@ -3110,7 +3115,7 @@ html_default_format_single_footnote (CONVERTER *self, 
const ELEMENT *element,
                            number_in_doc, footid);
   footnote_text
     = html_convert_tree_new_formatting_context (self,
-                                                element->e.c->args.list[0],
+                                                element->e.c->contents.list[0],
                                                 context_str, 0, 0, 0);
   free (context_str);
 
@@ -5969,10 +5974,10 @@ html_convert_explained_command (CONVERTER *self, const 
enum command_id cmd,
   EXPLAINED_COMMAND_TYPE_LIST *type_explanations
     = &self->shared_conversion_state.explained_commands;
 
-  if (element->e.c->args.number > 0
-      && element->e.c->args.list[0]->e.c->contents.number > 0)
+  if (element->e.c->contents.number > 0
+      && element->e.c->contents.list[0]->e.c->contents.number > 0)
     {
-      normalized_type = convert_to_identifier (element->e.c->args.list[0]);
+      normalized_type = convert_to_identifier (element->e.c->contents.list[0]);
     }
   else
     normalized_type = strdup ("");
@@ -7552,8 +7557,8 @@ html_convert_xref_command (CONVERTER *self, const enum 
command_id cmd,
       && strlen (args_formatted->args[4].formatted[AFT_type_normal]))
     book = args_formatted->args[4].formatted[AFT_type_normal];
 
-  if (element->e.c->args.number > 0)
-    arg_node = element->e.c->args.list[0];
+  if (element->e.c->contents.number > 0)
+    arg_node = element->e.c->contents.list[0];
 
   /* check for internal reference */
   if (cmd != CM_inforef && !book && !file && arg_node)
@@ -8393,12 +8398,13 @@ html_convert_float_command (CONVERTER *self, const enum 
command_id cmd,
       if (content)
         text_append (result, content);
 
-      if (caption_element && caption_element->e.c->args.number > 0
-          && caption_element->e.c->args.list[0]->e.c->contents.number > 0)
+      if (caption_element && caption_element->e.c->contents.number > 0
+          && caption_element->e.c->contents.list[0]->e.c->contents.number > 0)
         {
           char *caption_text
             = html_convert_tree_new_formatting_context (self,
-               caption_element->e.c->args.list[0], "float caption", 0, 0, 0);
+                          caption_element->e.c->contents.list[0],
+                          "float caption", 0, 0, 0);
           if (caption_text)
             {
               text_append (result, caption_text);
@@ -8432,7 +8438,7 @@ html_convert_float_command (CONVERTER *self, const enum 
command_id cmd,
       ELEMENT *strong_element
         = new_command_element (ET_brace_command, CM_strong);
 
-      add_to_element_args (strong_element, args);
+      add_to_element_contents (strong_element, args);
       add_to_element_contents (args, prepended);
 
       add_tree_to_build (self, strong_element);
@@ -8451,8 +8457,8 @@ html_convert_float_command (CONVERTER *self, const enum 
command_id cmd,
             html_register_pending_formatted_inline_content (self,
                               caption_command_name, prepended_text);
           caption_text = html_convert_tree_new_formatting_context (self,
-                           caption_element->e.c->args.list[0], "float caption",
-                                0, 0, 0);
+                               caption_element->e.c->contents.list[0],
+                               "float caption", 0, 0, 0);
           if (prepended_text)
             {
               cancelled_prepended
@@ -8480,8 +8486,8 @@ html_convert_float_command (CONVERTER *self, const enum 
command_id cmd,
   else if (caption_element)
     {
       caption_text = html_convert_tree_new_formatting_context (self,
-                           caption_element->e.c->args.list[0], "float caption",
-                                0, 0, 0);
+                                  caption_element->e.c->contents.list[0],
+                                  "float caption", 0, 0, 0);
     }
 
   if (caption_text && strlen (caption_text))
@@ -9513,7 +9519,7 @@ html_convert_listoffloats_command (CONVERTER *self, const 
enum command_id cmd,
                 {
                   char *caption_text
                     = html_convert_tree_new_formatting_context (self,
-                        caption_element->e.c->args.list[0],
+                        caption_element->e.c->contents.list[0],
                         builtin_command_name (cmd),
                         multiple_pass_str, 0, 0);
                   text_append (result, caption_text);
@@ -10057,11 +10063,12 @@ html_convert_printindex_command (CONVERTER *self, 
const enum command_id cmd,
               else
                 referred_tree = new_element (ET_NONE);
 
-              if (referred_entry->e.c->args.number > 0
-                  && referred_entry->e.c->args.list[0]->e.c->contents.number > 
0)
+              if (referred_entry->e.c->contents.number > 0
+                  && referred_entry->e.c->contents.list[0]
+                                            ->e.c->contents.number > 0)
                 {
                   ELEMENT *referred_copy
-                    = copy_tree (referred_entry->e.c->args.list[0]);
+                    = copy_tree (referred_entry->e.c->contents.list[0]);
                   add_to_contents_as_array (referred_tree, referred_copy);
                 }
 
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 9cc08570fa..01c7a881a3 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -804,7 +804,7 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
                             "arg_line", &info_hv);
         } /* verb is a brace command type and so cannot be confused
              with the preceding types */
-      else if (e->e.c->cmd == CM_verb && e->e.c->args.number > 0)
+      else if (e->e.c->cmd == CM_verb && e->e.c->contents.number > 0)
         store_info_string (e, e->e.c->string_info[sit_delimiter],
                            "delimiter", &info_hv);
     }
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 7bea9a819a..6b8af001d7 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -83,30 +83,15 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
   else if (e->e.c->args.number > 0)
     {
       size_t i, arg_nr;
-      int braces;
       int with_commas = 0;
 
-      braces = (e->e.c->args.list[0]->type == ET_brace_container
-                || e->e.c->args.list[0]->type == ET_brace_arg
-                || e->e.c->args.list[0]->type == ET_brace_command_context);
-      if (braces)
-        ADD("{");
-
-      if (cmd == CM_verb)
-        {
-          const char *delimiter = e->e.c->string_info[sit_delimiter];
-          ADD(delimiter);
-        }
-
       if (spc_before_arg)
         ADD((char *)spc_before_arg->e.text->text);
 
       if ((builtin_command_data[cmd].flags & CF_block
            && ! (builtin_command_data[cmd].flags & CF_def
                  || cmd == CM_multitable))
-          || cmd == CM_node
-          || (builtin_command_data[cmd].flags & CF_brace)
-          || (builtin_command_data[cmd].flags & CF_INFOENCLOSE))
+          || cmd == CM_node)
         with_commas = 1;
 
       arg_nr = 0;
@@ -124,6 +109,41 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
             }
           convert_to_texinfo_internal (arg, result);
         }
+    }
+  else if (e->e.c->contents.number > 0
+           && (builtin_command_data[cmd].flags & CF_brace
+               || builtin_command_data[cmd].flags & CF_INFOENCLOSE))
+    {
+      size_t i, arg_nr;
+      int braces;
+
+      braces = (e->e.c->contents.list[0]->type == ET_brace_container
+                || e->e.c->contents.list[0]->type == ET_brace_arg
+                || e->e.c->contents.list[0]->type == ET_brace_command_context);
+      if (braces)
+        ADD("{");
+
+      if (cmd == CM_verb)
+        {
+          const char *delimiter = e->e.c->string_info[sit_delimiter];
+          ADD(delimiter);
+        }
+
+      if (spc_before_arg)
+        ADD((char *)spc_before_arg->e.text->text);
+
+      arg_nr = 0;
+      for (i = 0; i < e->e.c->contents.number; i++)
+        {
+          ELEMENT *arg = e->e.c->contents.list[i];
+          if (arg->flags & EF_inserted)
+            continue;
+
+          if (arg_nr)
+            ADD(",");
+          arg_nr++;
+          convert_to_texinfo_internal (arg, result);
+        }
 
       if (cmd == CM_verb)
         {
@@ -158,7 +178,11 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT 
*result)
       if (e->e.c->cmd
           || e->type == ET_def_line)
         {
+          enum command_id cmd = element_builtin_cmd (e);
           expand_cmd_args_to_texi (e, result);
+          if (builtin_command_data[cmd].flags & CF_brace
+              || builtin_command_data[cmd].flags & CF_INFOENCLOSE)
+            return;
         }
       else
         {
diff --git a/tp/Texinfo/XS/main/convert_to_text.c 
b/tp/Texinfo/XS/main/convert_to_text.c
index c041399ccd..214daba296 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -620,6 +620,7 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
           && !(builtin_command_data[data_cmd].flags & CF_def)
           && !(data_cmd == CM_sp
                || data_cmd == CM_verbatiminclude))
+      || data_cmd == CM_footnote
       || data_cmd == CM_seeentry
       || data_cmd == CM_seealso
       || element->type == ET_postamble_after_end
@@ -704,13 +705,14 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
                                      text_options->set_case);
           ADD(text);
           free (text);
+          return;
         }
       else if (data_cmd == CM_image)
         {
-          if (element->e.c->args.number > 0)
+          if (element->e.c->contents.number > 0)
             {
               text_options->code_state++;
-              convert_to_text_internal (element->e.c->args.list[0],
+              convert_to_text_internal (element->e.c->contents.list[0],
                                         text_options, result);
               text_options->code_state--;
             }
@@ -718,11 +720,11 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
         }
       else if (data_cmd == CM_email)
         {
-          if (element->e.c->args.number >= 2)
+          if (element->e.c->contents.number >= 2)
             {
               TEXT replacement;
               text_init (&replacement);
-              convert_to_text_internal (element->e.c->args.list[1],
+              convert_to_text_internal (element->e.c->contents.list[1],
                                         text_options, &replacement);
               if (replacement.end > 0)
                 {
@@ -732,10 +734,10 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
                 }
             }
 
-          if (element->e.c->args.number > 0)
+          if (element->e.c->contents.number > 0)
             {
               text_options->code_state++;
-              convert_to_text_internal (element->e.c->args.list[0],
+              convert_to_text_internal (element->e.c->contents.list[0],
                                         text_options, result);
               text_options->code_state--;
             }
@@ -744,15 +746,15 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
         }
       else if (data_cmd == CM_uref || data_cmd == CM_url)
         {
-          if (element->e.c->args.number > 0)
+          if (element->e.c->contents.number > 0)
             {
               TEXT url_text;
 
-              if (element->e.c->args.number >= 3)
+              if (element->e.c->contents.number >= 3)
                 {
                   TEXT replacement;
                   text_init (&replacement);
-                  convert_to_text_internal (element->e.c->args.list[2],
+                  convert_to_text_internal (element->e.c->contents.list[2],
                                             text_options, &replacement);
                   if (replacement.end > 0)
                     {
@@ -765,14 +767,14 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
               text_init (&url_text);
               text_append (&url_text, "");
               text_options->code_state++;
-              convert_to_text_internal (element->e.c->args.list[0],
+              convert_to_text_internal (element->e.c->contents.list[0],
                                         text_options, &url_text);
               text_options->code_state--;
-              if (element->e.c->args.number >= 2)
+              if (element->e.c->contents.number >= 2)
                 {
                   TEXT text;
                   text_init (&text);
-                  convert_to_text_internal (element->e.c->args.list[1],
+                  convert_to_text_internal (element->e.c->contents.list[1],
                                             text_options, &text);
                   if (text.end > 0)
                     {
@@ -792,14 +794,14 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
           return;
         }
       else if ((builtin_command_data[data_cmd].other_flags & CF_explained)
-               && element->e.c->args.number >= 2)
+               && element->e.c->contents.number >= 2)
         {
           TEXT explanation;
           text_init (&explanation);
-          convert_to_text_internal (element->e.c->args.list[1],
+          convert_to_text_internal (element->e.c->contents.list[1],
                                     text_options, &explanation);
 
-          convert_to_text_internal (element->e.c->args.list[0],
+          convert_to_text_internal (element->e.c->contents.list[0],
                                     text_options, result);
           if (explanation.end > 0)
             {
@@ -824,17 +826,17 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
                 arg_index = 2;
             }
 
-          if (element->e.c->args.number > arg_index)
-            convert_to_text_internal (element->e.c->args.list[arg_index],
+          if (element->e.c->contents.number > arg_index)
+            convert_to_text_internal (element->e.c->contents.list[arg_index],
                                       text_options, result);
 
           if (data_cmd == CM_inlineraw)
             text_options->raw_state--;
           return;
         }
-      else if (element->e.c->args.number > 0
-                && (element->e.c->args.list[0]->type == ET_brace_container
-                    || element->e.c->args.list[0]->type == ET_brace_arg
+      else if (element->e.c->contents.number > 0
+                && (element->e.c->contents.list[0]->type == ET_brace_container
+                    || element->e.c->contents.list[0]->type == ET_brace_arg
                     || (builtin_command_data[data_cmd].flags & CF_brace
                         && builtin_command_data[data_cmd].flags & CF_math)))
         {
@@ -848,7 +850,7 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
 
           if (in_code)
             text_options->code_state++;
-          convert_to_text_internal (element->e.c->args.list[0],
+          convert_to_text_internal (element->e.c->contents.list[0],
                                     text_options, result);
           if (in_code)
             text_options->code_state--;
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index 45230d7f6e..3e1560b0bb 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -145,9 +145,9 @@ find_innermost_accent_contents (const ELEMENT *element)
 
       push_stack_element (&accent_stack->stack, current);
       /* A bogus accent, that may happen */
-      if (current->e.c->args.number <= 0)
+      if (current->e.c->contents.number <= 0)
         return accent_stack;
-      arg = current->e.c->args.list[0];
+      arg = current->e.c->contents.list[0];
       if (arg->e.c->contents.number <= 0)
         return accent_stack;
       for (i = 0; i < arg->e.c->contents.number; i++)
@@ -565,7 +565,7 @@ definition_category_tree (OPTIONS * options, const ELEMENT 
*current)
       ELEMENT *brace_container = new_element (ET_brace_container);
       arg_class_code = new_command_element (ET_brace_command, CM_code);
       add_to_element_contents (brace_container, class_copy);
-      add_to_element_args (arg_class_code, brace_container);
+      add_to_element_contents (arg_class_code, brace_container);
     }
    */
 
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c 
b/tp/Texinfo/XS/main/manipulate_indices.c
index f012e5a1f0..ce711ac680 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -1333,10 +1333,10 @@ idx_leading_text_or_command (ELEMENT *tree, const char 
*ignore_chars)
                     }
                   else if (brace_command_type != BRACE_inline)
                     {
-                      if (content->e.c->args.number > 0)
+                      if (content->e.c->contents.number > 0)
                         {
                           return idx_leading_text_or_command (
-                                                   content->e.c->args.list[0],
+                                               content->e.c->contents.list[0],
                                                               ignore_chars);
                         }
                     }
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c 
b/tp/Texinfo/XS/main/manipulate_tree.c
index 0369d2448f..4388cc960e 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -911,7 +911,7 @@ new_asis_command_with_text (const char *text, ELEMENT 
*parent,
   ELEMENT *brace_container = new_element (ET_brace_container);
   ELEMENT *text_elt = new_text_element (type);
   new_command->parent = parent;
-  add_to_element_args (new_command, brace_container);
+  add_to_element_contents (new_command, brace_container);
   text_append (text_elt->e.text, text);
   add_to_element_contents (brace_container, text_elt);
   return new_command;
@@ -988,7 +988,7 @@ protect_text (ELEMENT *current, const char *to_protect)
                       ELEMENT *brace_container
                            = new_element (ET_brace_container);
                       comma->parent = current->parent;
-                      add_to_element_args (comma, brace_container);
+                      add_to_element_contents (comma, brace_container);
                       add_to_element_list (container, comma);
                       if (u8_text)
                         {
@@ -1018,7 +1018,7 @@ protect_text (ELEMENT *current, const char *to_protect)
 
                       current_position
                        = relocate_source_marks (current->source_mark_list,
-                           
new_command->e.c->args.list[0]->e.c->contents.list[0],
+                    new_command->e.c->contents.list[0]->e.c->contents.list[0],
                                               current_position, u8_len);
                     }
                   p += to_protect_nr;
diff --git a/tp/Texinfo/XS/main/node_name_normalization.c 
b/tp/Texinfo/XS/main/node_name_normalization.c
index 827b945b3e..6d10511962 100644
--- a/tp/Texinfo/XS/main/node_name_normalization.c
+++ b/tp/Texinfo/XS/main/node_name_normalization.c
@@ -97,13 +97,14 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT 
*result)
         }
       else if (builtin_command_data[e->e.c->cmd].flags & CF_accent)
         {
-          if (e->e.c->args.number > 0)
+          if (e->e.c->contents.number > 0)
             {
               TEXT accent_text;
               char *accented_char;
 
               text_init (&accent_text);
-              convert_to_normalized_internal (e->e.c->args.list[0], 
&accent_text);
+              convert_to_normalized_internal (e->e.c->contents.list[0],
+                                              &accent_text);
               accented_char = unicode_accent (accent_text.text, e);
               if (accented_char)
                 {
@@ -116,6 +117,7 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT 
*result)
                 ADD(accent_text.text);
               free (accent_text.text);
             }
+          return;
         }
       else if (builtin_command_data[e->e.c->cmd].flags & CF_ref)
         {
@@ -127,13 +129,13 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT 
*result)
             {
               /* no risk with that casting as idx < 5 */
               size_t idx = (size_t) arguments_order[order_index];
-              if (e->e.c->args.number > idx)
+              if (e->e.c->contents.number > idx)
                 {
                   TEXT arg_text;
 
                   text_init (&arg_text);
                   convert_to_normalized_internal (
-                    e->e.c->args.list[idx], &arg_text);
+                    e->e.c->contents.list[idx], &arg_text);
                   if (arg_text.end > 0)
                     {
                       char *non_space_char = arg_text.text
@@ -148,13 +150,14 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT 
*result)
                 }
               order_index++;
             }
+          return;
         }
-      else if (e->e.c->args.number > 0
-               && (e->e.c->args.list[0]->type == ET_brace_container
-                   || e->e.c->args.list[0]->type == ET_brace_arg
+      else if (e->e.c->contents.number > 0
+               && (e->e.c->contents.list[0]->type == ET_brace_container
+                   || e->e.c->contents.list[0]->type == ET_brace_arg
                    || e->e.c->cmd == CM_math))
         {
-          convert_to_normalized_internal (e->e.c->args.list[0], result);
+          convert_to_normalized_internal (e->e.c->contents.list[0], result);
           return;
         }
     }
diff --git a/tp/Texinfo/XS/main/translations.c 
b/tp/Texinfo/XS/main/translations.c
index aae481e587..ce2e661b6a 100644
--- a/tp/Texinfo/XS/main/translations.c
+++ b/tp/Texinfo/XS/main/translations.c
@@ -452,7 +452,7 @@ substitute_element_array (ELEMENT_LIST *list,
         {
           if (e->e.c->cmd == CM_txiinternalvalue)
             {
-              char *name = e->e.c->args.list[0]->e.c->contents.list[0]
+              char *name = e->e.c->contents.list[0]->e.c->contents.list[0]
                                                             ->e.text->text;
               size_t i;
               for (i = 0; i < replaced_substrings->number; i++)
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 95b55a15af..b226f44c5f 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -654,9 +654,10 @@ item_line_parent (ELEMENT *current)
 ELEMENT *
 get_label_element (const ELEMENT *e)
 {
-  if ((e->e.c->cmd == CM_node || e->e.c->cmd == CM_anchor)
-      && e->e.c->args.number > 0)
+  if (e->e.c->cmd == CM_node && e->e.c->args.number > 0)
     return e->e.c->args.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->args.number >= 2)
     return e->e.c->args.list[1];
   return 0;
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index a4a214a94e..f649d28c15 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1017,7 +1017,7 @@ end_line_starting_block (ELEMENT *current)
           /* if the command as argument does not have braces but it is
              not a mark (noarg) command, warn */
               if (k_command_as_arg
-                  && command_as_arg_e->e.c->args.number <= 0
+                  && command_as_arg_e->e.c->contents.number <= 0
               /* only brace commands are registered as command_as_argument
                  so we can assume that the following is true:
                  && command_data(command_as_arg_e->e.c->cmd).flags & CF_brace
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 4c3f231ff3..d16167f7b3 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1185,7 +1185,7 @@ new_value_element (enum command_id cmd, const char *flag,
   ELEMENT *value_text = new_text_element (ET_normal_text);
 
   text_append_n (value_text->e.text, flag, flag_len);
-  add_to_element_args (value_elt, brace_container);
+  add_to_element_contents (value_elt, brace_container);
   add_to_element_contents (brace_container, value_text);
   if (spaces_element)
     value_elt->elt_info[eit_spaces_after_cmd_before_arg]
@@ -2204,7 +2204,7 @@ process_remaining_on_line (ELEMENT **current_inout, const 
char **line_inout)
           int char_len;
 
           e = new_element (ET_following_arg);
-          add_to_element_args (current, e);
+          add_to_element_contents (current, e);
 
           /* Count any UTF-8 continuation bytes. */
           char_len = 1;
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 840ef1690a..17a47a39de 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -68,7 +68,7 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
       if (cmd == CM_verb)
         {
           arg = new_element (ET_brace_container);
-          add_to_element_args (current, arg);
+          add_to_element_contents (current, arg);
           current = arg;
 
           /* the delimiter may be in macro expansion */
@@ -98,7 +98,7 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
           int n;
 
           arg = new_element (ET_brace_command_context);
-          add_to_element_args (current, arg);
+          add_to_element_contents (current, arg);
           current = arg;
           if (cmd == CM_caption || cmd == CM_shortcaption)
             {
@@ -192,7 +192,7 @@ handle_open_brace (ELEMENT *current, const char 
**line_inout)
             {
               arg = new_element (ET_brace_container);
             }
-          add_to_element_args (current, arg);
+          add_to_element_contents (current, arg);
           current = arg;
         }
       debug_nonl ("OPENED @%s, remaining: %d ",
@@ -333,22 +333,22 @@ handle_close_brace (ELEMENT *current, const char 
**line_inout)
           int link_or_inforef = (closed_cmd == CM_link
                                  || closed_cmd == CM_inforef);
           if ((link_or_inforef
-               && (ref->e.c->args.list[0]->e.c->contents.number == 0)
-               && (ref->e.c->args.number <= 2
-                   || ref->e.c->args.list[2]->e.c->contents.number == 0))
+               && (ref->e.c->contents.list[0]->e.c->contents.number == 0)
+               && (ref->e.c->contents.number <= 2
+                   || ref->e.c->contents.list[2]->e.c->contents.number == 0))
               || (!link_or_inforef
-                   && (ref->e.c->args.list[0]->e.c->contents.number == 0)
-                   && (ref->e.c->args.number <= 3
-                       || ref->e.c->args.list[3]->e.c->contents.number == 0)
-                   && (ref->e.c->args.number <= 4
-                       || ref->e.c->args.list[4]->e.c->contents.number == 0)))
+                   && (ref->e.c->contents.list[0]->e.c->contents.number == 0)
+                   && (ref->e.c->contents.number <= 3
+                       || ref->e.c->contents.list[3]->e.c->contents.number == 
0)
+                   && (ref->e.c->contents.number <= 4
+                || ref->e.c->contents.list[4]->e.c->contents.number == 0)))
             {
               line_warn ("command @%s missing a node or external manual "
                          "argument", command_name(closed_cmd));
             }
           else
             {
-              ELEMENT *arg_label = args_child_by_index (ref, 0);
+              ELEMENT *arg_label = contents_child_by_index (ref, 0);
               NODE_SPEC_EXTRA *ref_label_info = parse_node_manual (arg_label, 
1);
 
               if (ref_label_info && (ref_label_info->manual_content
@@ -369,15 +369,17 @@ handle_close_brace (ELEMENT *current, const char 
**line_inout)
                     destroy_element (ref_label_info->node_content);
                 }
               if ((!link_or_inforef
-                   && (ref->e.c->args.number <= 3
-                       || (ref->e.c->args.number <= 4
-                           && ref->e.c->args.list[3]->e.c->contents.number == 
0)
-                       || (ref->e.c->args.list[3]->e.c->contents.number == 0
-                           && ref->e.c->args.list[4]->e.c->contents.number == 
0))
+                   && (ref->e.c->contents.number <= 3
+                       || (ref->e.c->contents.number <= 4
+                           && ref->e.c->contents.list[3]
+                                            ->e.c->contents.number == 0)
+                       || (ref->e.c->contents.list[3]->e.c->contents.number == 0
+                           && ref->e.c->contents.list[4]
+                                           ->e.c->contents.number == 0))
                    && !ref_label_info->manual_content)
                   || (link_or_inforef
-                      && (ref->e.c->args.number <= 2
-                          || ref->e.c->args.list[2]->e.c->contents.number == 
0)))
+                      && (ref->e.c->contents.number <= 2
+                   || ref->e.c->contents.list[2]->e.c->contents.number == 0)))
                 {
                   /* we use the @*ref command here and not the label
                      command to have more information for messages */
@@ -386,39 +388,39 @@ handle_close_brace (ELEMENT *current, const char 
**line_inout)
               free (ref_label_info);
             }
 
-          if (ref->e.c->args.number > 1
-              && ref->e.c->args.list[1]->e.c->contents.number > 0)
+          if (ref->e.c->contents.number > 1
+              && ref->e.c->contents.list[1]->e.c->contents.number > 0)
             {
-              if (check_empty_expansion (ref->e.c->args.list[1]))
+              if (check_empty_expansion (ref->e.c->contents.list[1]))
                 {
                   char *texi = 0;
-                  if (ref->e.c->args.list[1])
+                  if (ref->e.c->contents.list[1])
                     texi
-                     = convert_contents_to_texinfo (ref->e.c->args.list[1]);
+                     = convert_contents_to_texinfo 
(ref->e.c->contents.list[1]);
 
                   line_warn ("in @%s empty cross reference name "
                              "after expansion `%s'",
                              command_name(closed_cmd),
-                             ref->e.c->args.list[1] ? texi : "");
+                             ref->e.c->contents.list[1] ? texi : "");
                   free (texi);
                 }
             }
 
           if (!link_or_inforef
-              && ref->e.c->args.number > 2
-              && ref->e.c->args.list[2]->e.c->contents.number > 0)
+              && ref->e.c->contents.number > 2
+              && ref->e.c->contents.list[2]->e.c->contents.number > 0)
             {
-              if (check_empty_expansion (ref->e.c->args.list[2]))
+              if (check_empty_expansion (ref->e.c->contents.list[2]))
                 {
                   char *texi = 0;
-                  if (ref->e.c->args.list[2])
+                  if (ref->e.c->contents.list[2])
                     texi
-                      = convert_contents_to_texinfo (ref->e.c->args.list[2]);
+                    = convert_contents_to_texinfo (ref->e.c->contents.list[2]);
 
                   line_warn ("in @%s empty cross reference title "
                              "after expansion `%s'",
                              command_name(closed_cmd),
-                             ref->e.c->args.list[2] ? texi : "");
+                             ref->e.c->contents.list[2] ? texi : "");
                   free (texi);
                 }
             }
@@ -427,7 +429,7 @@ handle_close_brace (ELEMENT *current, const char 
**line_inout)
         {
           GLOBAL_INFO *global_info = &parsed_document->global_info;
           ELEMENT *image = brace_command;
-          if (image->e.c->args.list[0]->e.c->contents.number == 0)
+          if (image->e.c->contents.list[0]->e.c->contents.number == 0)
             {
               line_error ("@image missing filename argument");
             }
@@ -456,7 +458,7 @@ handle_close_brace (ELEMENT *current, const char 
**line_inout)
                || closed_cmd == CM_abbr
                || closed_cmd == CM_acronym)
         {
-          if (brace_command->e.c->args.list[0]->e.c->contents.number == 0)
+          if (brace_command->e.c->contents.list[0]->e.c->contents.number == 0)
             {
               line_warn ("@%s missing first argument",
                          command_name(closed_cmd));
@@ -615,7 +617,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
 {
   const char *line = *line_inout;
   enum element_type type;
-  ELEMENT *brace_command;
+  ELEMENT *command_element;
   ELEMENT *new_arg, *spaces_before_e;
   ELEMENT *new_current;
 
@@ -623,15 +625,15 @@ handle_comma (ELEMENT *current, const char **line_inout)
   isolate_last_space (current);
 
   type = current->type;
-  brace_command = current->parent;
+  command_element = current->parent;
 
-  if (counter_value (&count_remaining_args, brace_command) != COUNTER_VARIADIC)
+  if (counter_value (&count_remaining_args, command_element) != 
COUNTER_VARIADIC)
     counter_dec (&count_remaining_args);
 
-  if (command_data(brace_command->e.c->cmd).data == BRACE_inline)
+  if (command_data(command_element->e.c->cmd).data == BRACE_inline)
     {
       int expandp = 0;
-      const char *format = lookup_extra_string (brace_command, AI_key_format);
+      const char *format = lookup_extra_string (command_element, 
AI_key_format);
       if (!format)
         {/* get the first argument, which is also current that was before the 
comma
             and put it in extra format */
@@ -647,51 +649,52 @@ handle_comma (ELEMENT *current, const char **line_inout)
             {
               /* Condition is missing */
               debug ("INLINE COND MISSING");
-              add_extra_string (brace_command, AI_key_format, 0);
+              add_extra_string (command_element, AI_key_format, 0);
             }
           else
             {
               debug ("INLINE: %s", inline_type);
-              if (brace_command->e.c->cmd == CM_inlineraw
-                  || brace_command->e.c->cmd == CM_inlinefmt
-                  || brace_command->e.c->cmd == CM_inlinefmtifelse)
+              if (command_element->e.c->cmd == CM_inlineraw
+                  || command_element->e.c->cmd == CM_inlinefmt
+                  || command_element->e.c->cmd == CM_inlinefmtifelse)
                 {
                   if (parser_format_expanded_p (inline_type))
                     {
                       expandp = 1;
-                      add_extra_integer (brace_command, AI_key_expand_index, 
1);
+                      add_extra_integer (command_element,
+                                         AI_key_expand_index, 1);
                     }
                   else
                     expandp = 0;
                 }
-              else if (brace_command->e.c->cmd == CM_inlineifset
-                       || brace_command->e.c->cmd == CM_inlineifclear)
+              else if (command_element->e.c->cmd == CM_inlineifset
+                       || command_element->e.c->cmd == CM_inlineifclear)
                 {
                   expandp = 0;
                   if (fetch_value (inline_type))
                     expandp = 1;
-                  if (brace_command->e.c->cmd == CM_inlineifclear)
+                  if (command_element->e.c->cmd == CM_inlineifclear)
                     expandp = !expandp;
                   if (expandp)
-                    add_extra_integer (brace_command, AI_key_expand_index, 1);
+                    add_extra_integer (command_element, AI_key_expand_index, 
1);
                 }
               else
                 expandp = 0;
 
-              add_extra_string_dup (brace_command, AI_key_format, inline_type);
+              add_extra_string_dup (command_element, AI_key_format, 
inline_type);
             }
 
           /* Skip first argument for a false @inlinefmtifelse */
-          if (!expandp && brace_command->e.c->cmd == CM_inlinefmtifelse)
+          if (!expandp && command_element->e.c->cmd == CM_inlinefmtifelse)
             {
               ELEMENT *elided_arg_elt;
               ELEMENT *arg_text_e;
               int brace_count = 1;
 
-              add_extra_integer (brace_command, AI_key_expand_index, 2);
+              add_extra_integer (command_element, AI_key_expand_index, 2);
 
               elided_arg_elt = new_element (ET_elided_brace_command_arg);
-              add_to_element_args (brace_command, elided_arg_elt);
+              add_to_element_contents (command_element, elided_arg_elt);
               arg_text_e = new_text_element (ET_raw);
               add_to_element_contents (elided_arg_elt, arg_text_e);
 
@@ -755,7 +758,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
         { /* format is set, so this is the second comma */
           /* Second part (not counting the format) of @inlinefmtifelse when
              condition is true.  Discard second part. */
-          if (brace_command->e.c->cmd == CM_inlinefmtifelse)
+          if (command_element->e.c->cmd == CM_inlinefmtifelse)
             expandp = 0;
           else
         /* the functions is called only for an @-command with 3 arguments for
@@ -773,7 +776,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
           int brace_count = 1;
 
           elided_arg_elt = new_element (ET_elided_brace_command_arg);
-          add_to_element_args (brace_command, elided_arg_elt);
+          add_to_element_contents (command_element, elided_arg_elt);
           arg_text_e = new_text_element (ET_raw);
           add_to_element_contents (elided_arg_elt, arg_text_e);
 
@@ -814,7 +817,10 @@ handle_comma (ELEMENT *current, const char **line_inout)
     }
 
   new_arg = new_element (type);
-  add_to_element_args (brace_command, new_arg);
+  if (command_flags(command_element) & CF_brace)
+    add_to_element_contents (command_element, new_arg);
+  else
+    add_to_element_args (command_element, new_arg);
   spaces_before_e = new_text_element (ET_internal_spaces_before_argument);
   add_to_element_contents (new_arg, spaces_before_e);
   internal_space_holder = new_arg;
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c 
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index 38678f42a9..a459f2a0b6 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -30,6 +30,7 @@
 #include "document_types.h"
 /* fatal */
 #include "base_utils.h"
+#include "types_data.h"
 #include "tree.h"
 #include "extra.h"
 #include "builtin_commands.h"
@@ -697,11 +698,15 @@ check_nodes_are_referenced (DOCUMENT *document)
       for (i = 0; i < refs->number; i++)
         {
           ELEMENT *ref = refs->list[i];
-          if (ref->e.c->args.number > 0)
+          if (ref->e.c->contents.number > 0)
             {
-              ELEMENT *label_arg = ref->e.c->args.list[0];
-              char *ref_normalized = lookup_extra_string (label_arg,
-                                                          AI_key_normalized);
+              ELEMENT *label_arg = ref->e.c->contents.list[0];
+              char *ref_normalized;
+              if (type_data[label_arg->type].flags & TF_text)
+                continue;
+
+              ref_normalized = lookup_extra_string (label_arg,
+                                                    AI_key_normalized);
               if (ref_normalized)
                 {
                   ELEMENT *target = find_identifier_target (identifiers_target,
@@ -1520,7 +1525,7 @@ associate_internal_references (DOCUMENT *document)
       if (ref->type == ET_menu_entry_node)
         label_element = ref;
       else
-        label_element = ref->e.c->args.list[0];
+        label_element = ref->e.c->contents.list[0];
 
       label_node_content
         = lookup_extra_container (label_element, AI_key_node_content);
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c 
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index ce04c29b31..ce610dc9a2 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -116,7 +116,7 @@ protect_first_parenthesis (ELEMENT *element)
 
               current_position
                 = relocate_source_marks (content->source_mark_list,
-                              
new_command->e.c->args.list[0]->e.c->contents.list[0],
+                    new_command->e.c->contents.list[0]->e.c->contents.list[0],
                                      current_position, u8_len);
               destroy_element_empty_source_mark_list (content);
             }
@@ -277,7 +277,7 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT 
*commands_heading_content)
                     = new_command_element (ET_brace_command, CM_asis);
                   ELEMENT *brace_container
                     = new_element (ET_brace_container);
-                  add_to_element_args (asis_command, brace_container);
+                  add_to_element_contents (asis_command, brace_container);
                   line_content = asis_command;
                 }
               add_to_element_contents (line_arg, line_content);
@@ -888,9 +888,9 @@ reference_to_arg_internal (const char *type,
       while (arguments_order[order_index] >= 0)
         {
           size_t idx = (size_t) arguments_order[order_index];
-          if (e->e.c->args.number > idx)
+          if (e->e.c->contents.number > idx)
             {
-              ELEMENT *arg = e->e.c->args.list[idx];
+              ELEMENT *arg = e->e.c->contents.list[idx];
             /*
              this will not detect if the content expands as spaces only, like
              @asis{ }, @ , but it is not an issue or could even be considered
@@ -898,7 +898,7 @@ reference_to_arg_internal (const char *type,
              */
               if (!is_content_empty (arg, 0))
                 {
-                  ELEMENT *removed = remove_from_args (e, idx);
+                  ELEMENT *removed = remove_from_contents (e, idx);
                   size_t i;
                   if (removed != arg)
                     fatal ("BUG: reference_to_arg_internal removed != arg");
@@ -1451,7 +1451,7 @@ protect_hashchar_at_line_beginning_internal (const char 
*type,
                           p++;
 
                           hashchar->parent = parent;
-                          add_to_element_args (hashchar, arg);
+                          add_to_element_contents (hashchar, arg);
                           add_to_element_list (container, hashchar);
 
                           if (u8_text)
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index 345ed2f001..493fe3f7a4 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -274,7 +274,7 @@ sub l2h_process($$)
       my $command = $element->{'cmdname'};
       my $tree;
       if ($command eq 'math') {
-        $tree = $element->{'args'}->[0];
+        $tree = $element->{'contents'}->[0];
       } else {
         $tree = {'contents' => [@{$element->{'contents'}}]};
         if ($tree->{'contents'}->[0]
diff --git a/tp/ext/tex4ht.pm b/tp/ext/tex4ht.pm
index 01dbb0d734..264ca333a9 100644
--- a/tp/ext/tex4ht.pm
+++ b/tp/ext/tex4ht.pm
@@ -218,7 +218,7 @@ sub tex4ht_prepare($$)
         my $cmdname = $element->{'cmdname'};
         my $tree;
         if ($cmdname eq 'math') {
-          $tree = $element->{'args'}->[0];
+          $tree = $element->{'contents'}->[0];
         } elsif ($element->{'contents'}) {
           $tree = {'contents' => [@{$element->{'contents'}}]};
           if (scalar(@{$tree->{'contents'}})
diff --git a/tp/init/documentation_examples.pm 
b/tp/init/documentation_examples.pm
index 3edf321a12..013a81d52c 100644
--- a/tp/init/documentation_examples.pm
+++ b/tp/init/documentation_examples.pm
@@ -404,7 +404,7 @@ sub my_test_documentation_convert_xref_commands($$$$)
   my $xref_tree_element = $command;
   my $prepended = '';
 
-  my $arg_node = $xref_tree_element->{'args'}->[0];
+  my $arg_node = $xref_tree_element->{'contents'}->[0];
   if ($arg_node and $arg_node->{'extra'}
       and defined($arg_node->{'extra'}->{'normalized'})) {
     my $target_node
diff --git a/tp/t/01use.t b/tp/t/01use.t
index 601a0ce896..5f19f1179c 100644
--- a/tp/t/01use.t
+++ b/tp/t/01use.t
@@ -28,7 +28,7 @@ my $manual_tree = { 'cmdname' => 'multitable',
                'contents' => [
                                {'text' => 'xx'},
                                {'cmdname' => 'b',
-                                'args' => [
+                                'contents' => [
                                             {
                                               'type' => 'brace_container',
                                               'contents' => [
@@ -50,7 +50,7 @@ my $manual_tree = { 'cmdname' => 'multitable',
                                'contents' => [
                                                 { 'text' => "title" },
                                                 { 'cmdname' => 'verb',
-                                                  'args' => [ {
+                                                  'contents' => [ {
                                                                'contents' => [
                                                                   { 'text' => 
' in verb } ',
                                                                     'type' => 
'raw' }
diff --git a/tp/t/09indices.t b/tp/t/09indices.t
index b87272dbde..b632d8fe48 100644
--- a/tp/t/09indices.t
+++ b/tp/t/09indices.t
@@ -1169,13 +1169,13 @@ my @latex_tests_cases_tests = 
('syncode_index_print_both',
   'same_only_seealso_seeentry');
 
 foreach my $test (@test_formatted) {
+  $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
   push @{$test->[2]->{'test_formats'}}, 'info';
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   push @{$test->[2]->{'test_formats'}}, 'xml';
   push @{$test->[2]->{'test_formats'}}, 'latex'
     if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
-  $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
 }
 
 foreach my $test (@file_tests) {
diff --git a/tp/t/init/footnote_mark_in_inline_content.pm 
b/tp/t/init/footnote_mark_in_inline_content.pm
index 296f74bf26..0dee7af4f3 100644
--- a/tp/t/init/footnote_mark_in_inline_content.pm
+++ b/tp/t/init/footnote_mark_in_inline_content.pm
@@ -13,7 +13,7 @@ sub 
_texi2any_test_format_single_footnote_in_inline_content($$$$$$)
   $self->register_pending_formatted_inline_content($category, 
$leading_content);
 
   my $footnote_text
-      = $self->convert_tree_new_formatting_context($command->{'args'}->[0],
+      = $self->convert_tree_new_formatting_context($command->{'contents'}->[0],
                             "$command->{'cmdname'} $number_in_doc $id");
   chomp ($footnote_text);
   $footnote_text .= "\n";
diff --git a/tp/t/results/alias/alias_of_definfoenclose.pl 
b/tp/t/results/alias/alias_of_definfoenclose.pl
index dcaea5f661..66f6066181 100644
--- a/tp/t/results/alias/alias_of_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose.pl
@@ -89,7 +89,8 @@ $result_trees{'alias_of_definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ $result_trees{'alias_of_definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
diff --git 
a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl 
b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
index 546e0388d6..bcd67ddae4 100644
--- a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
@@ -89,7 +89,8 @@ 
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ 
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
diff --git a/tp/t/results/alias/alias_zero.pl b/tp/t/results/alias/alias_zero.pl
index af12f63cbe..05f7c2097b 100644
--- a/tp/t/results/alias/alias_zero.pl
+++ b/tp/t/results/alias/alias_zero.pl
@@ -45,7 +45,8 @@ $result_trees{'alias_zero'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -55,7 +56,6 @@ $result_trees{'alias_zero'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => '0'
               },
diff --git a/tp/t/results/alias/bad_line.pl b/tp/t/results/alias/bad_line.pl
index 0f98560893..1e9cb78c25 100644
--- a/tp/t/results/alias/bad_line.pl
+++ b/tp/t/results/alias/bad_line.pl
@@ -54,7 +54,8 @@ $result_trees{'bad_line'} = {
                   'text' => 'garbage-on-line =cmd '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -64,7 +65,6 @@ $result_trees{'bad_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 4
                   }
diff --git a/tp/t/results/alias/recursive_alias.pl 
b/tp/t/results/alias/recursive_alias.pl
index 12c1c9b314..966b4f0fcd 100644
--- a/tp/t/results/alias/recursive_alias.pl
+++ b/tp/t/results/alias/recursive_alias.pl
@@ -126,7 +126,8 @@ $result_trees{'recursive_alias'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -136,7 +137,6 @@ $result_trees{'recursive_alias'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => 'other'
               },
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 02fa3a19cb..dc97083d6e 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -100,7 +100,8 @@ $result_trees{'simple'} = {
               'text' => 'Should be code: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -110,7 +111,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'info' => {
                 'alias_of' => 'myalias'
               },
@@ -136,7 +136,8 @@ $result_trees{'simple'} = {
               'text' => 'Should be verb: '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -147,7 +148,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'alias_of' => 'o-theralias',
                 'delimiter' => '!'
diff --git a/tp/t/results/alias/texinfo_command_alias.pl 
b/tp/t/results/alias/texinfo_command_alias.pl
index be846e274a..75f0d35b01 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -195,7 +195,8 @@ $result_trees{'texinfo_command_alias'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'mystrong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -205,7 +206,6 @@ $result_trees{'texinfo_command_alias'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'mystrong',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
index e031b9bf54..27641512e3 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -150,7 +150,8 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -160,7 +161,6 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => 'new'
               },
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index 8f568b8cc7..a6f657e6f9 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -18,7 +18,8 @@ $result_trees{'wrong_command'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -28,7 +29,6 @@ $result_trees{'wrong_command'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 1
                           }
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl 
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index 380c7147e1..5f090b9a4a 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -73,7 +73,8 @@ $result_trees{'empty_set_in_ifset'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -82,8 +83,7 @@ $result_trees{'empty_set_in_ifset'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '',
                   'position' => 13,
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index 7bd588108b..268085a7c1 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -346,7 +346,8 @@ $result_trees{'end_ifset_in_format'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -363,7 +364,6 @@ $result_trees{'end_ifset_in_format'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '%'
               },
diff --git a/tp/t/results/conditionals/ifset_in_command.pl 
b/tp/t/results/conditionals/ifset_in_command.pl
index 0097fa3d9c..75363f5acd 100644
--- a/tp/t/results/conditionals/ifset_in_command.pl
+++ b/tp/t/results/conditionals/ifset_in_command.pl
@@ -17,7 +17,8 @@ $result_trees{'ifset_in_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -174,7 +175,6 @@ $result_trees{'ifset_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl 
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index 11783d364b..59723b6579 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse_nesting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -33,7 +34,8 @@ $result_trees{'inlinefmtifelse_nesting'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -43,7 +45,6 @@ $result_trees{'inlinefmtifelse_nesting'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -57,7 +58,6 @@ $result_trees{'inlinefmtifelse_nesting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'info'
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
index 8e57103d5e..dab5c24d39 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
diff --git 
a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
index 7c4ab44570..ad469bf4d4 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -45,7 +46,6 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
index bcb678c534..8945d3d36c 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
diff --git a/tp/t/results/conditionals/inlineifset_false_not_closed.pl 
b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
index 27487f1cb7..76154a2b21 100644
--- a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
+++ b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifset_false_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'inlineifset_false_not_closed'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'aaa'
               },
diff --git a/tp/t/results/conditionals/value_on_ifset.pl 
b/tp/t/results/conditionals/value_on_ifset.pl
index 7f90d11756..11fcb3a42d 100644
--- a/tp/t/results/conditionals/value_on_ifset.pl
+++ b/tp/t/results/conditionals/value_on_ifset.pl
@@ -79,7 +79,8 @@ $result_trees{'value_on_ifset'} = {
                       {
                         'counter' => 1,
                         'element' => {
-                          'args' => [
+                          'cmdname' => 'value',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -88,8 +89,7 @@ $result_trees{'value_on_ifset'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'value'
+                          ]
                         },
                         'line' => 'x',
                         'position' => 1,
diff --git a/tp/t/results/converters_tests/accent_with_text.pl 
b/tp/t/results/converters_tests/accent_with_text.pl
index 8b3954962e..1a0060cf3f 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_with_text'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'accent_with_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'accent_with_text'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'accent_with_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -50,14 +50,16 @@ $result_trees{'accent_with_text'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '--'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -67,7 +69,6 @@ $result_trees{'accent_with_text'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -76,7 +77,6 @@ $result_trees{'accent_with_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -85,14 +85,16 @@ $result_trees{'accent_with_text'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '--'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -102,7 +104,6 @@ $result_trees{'accent_with_text'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -111,7 +112,6 @@ $result_trees{'accent_with_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -120,7 +120,8 @@ $result_trees{'accent_with_text'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -130,7 +131,6 @@ $result_trees{'accent_with_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
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 300169a3a6..d053490a9e 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -210,7 +210,8 @@ $result_trees{'at_commands_in_raw'} = {
                   'text' => '<b>in b'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -225,7 +226,6 @@ $result_trees{'at_commands_in_raw'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 12
@@ -236,7 +236,8 @@ $result_trees{'at_commands_in_raw'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -246,7 +247,6 @@ $result_trees{'at_commands_in_raw'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'anchor-in-html'
@@ -301,7 +301,8 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -311,13 +312,13 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 15
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -332,7 +333,6 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 15
@@ -635,7 +635,8 @@ $result_trees{'at_commands_in_raw'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -644,8 +645,7 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         },
         {
           'contents' => [
@@ -664,7 +664,8 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -674,7 +675,6 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -694,7 +694,8 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -712,7 +713,6 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 69
               }
@@ -732,7 +732,8 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -750,7 +751,6 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -928,7 +928,8 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -938,7 +939,6 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 81
               }
@@ -1052,8 +1052,8 @@ $result_trees{'at_commands_in_raw'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'at_commands_in_raw'} = '@node Top
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index f25e3eb36e..b555b9cc65 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -176,7 +176,8 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -186,7 +187,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -195,7 +195,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -205,7 +206,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -214,7 +214,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -224,7 +225,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -233,7 +233,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -243,7 +244,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -252,7 +252,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -262,7 +263,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -271,7 +271,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -281,7 +282,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -301,11 +301,13 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -315,7 +317,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -324,7 +325,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -334,11 +334,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -348,7 +350,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -357,7 +358,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -367,11 +367,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -381,7 +383,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -390,7 +391,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -400,11 +400,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -414,7 +416,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -423,7 +424,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -433,11 +433,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -447,7 +449,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -456,7 +457,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -466,11 +466,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -480,7 +482,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -489,7 +490,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -509,7 +509,8 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -519,7 +520,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -539,11 +539,13 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -553,7 +555,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -562,7 +563,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -572,11 +572,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -586,7 +588,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -595,7 +596,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -615,7 +615,8 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -625,7 +626,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -634,7 +634,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -644,7 +645,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -653,7 +653,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -663,7 +664,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -672,7 +672,8 @@ $result_trees{'combined_fonts'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -682,7 +683,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -702,11 +702,13 @@ $result_trees{'combined_fonts'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -716,7 +718,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -725,7 +726,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -735,11 +735,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -749,7 +751,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -758,7 +759,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -768,11 +768,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -782,7 +784,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 27
                       }
@@ -791,7 +792,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -801,11 +801,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -815,7 +817,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -824,7 +825,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -834,11 +834,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -848,7 +850,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -857,7 +858,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -867,11 +867,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -881,7 +883,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 30
                       }
@@ -890,7 +891,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -900,11 +900,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -914,7 +916,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -923,7 +924,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -933,11 +933,13 @@ $result_trees{'combined_fonts'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -947,7 +949,6 @@ $result_trees{'combined_fonts'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 32
                       }
@@ -956,7 +957,6 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -990,7 +990,8 @@ $result_trees{'combined_fonts'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1000,7 +1001,6 @@ $result_trees{'combined_fonts'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 35
                   }
@@ -1010,7 +1010,8 @@ $result_trees{'combined_fonts'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'cite',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1020,7 +1021,6 @@ $result_trees{'combined_fonts'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'cite',
                   'source_info' => {
                     'line_nr' => 36
                   }
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 2f1c16345c..ab22aa940d 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -134,14 +134,16 @@ $result_trees{'commands_in_sc'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -151,7 +153,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -160,12 +161,12 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -174,12 +175,12 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -188,7 +189,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -198,7 +200,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -210,7 +211,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -228,7 +230,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -237,7 +238,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'xref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -268,7 +270,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'xref',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -278,7 +279,8 @@ $result_trees{'commands_in_sc'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -314,7 +316,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -323,7 +324,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'inlinefmtifelse',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -344,7 +346,8 @@ $result_trees{'commands_in_sc'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'verb',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -355,7 +358,6 @@ $result_trees{'commands_in_sc'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'verb',
                               'info' => {
                                 'delimiter' => '!'
                               },
@@ -367,7 +369,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'inlinefmtifelse',
                       'extra' => {
                         'expand_index' => 2,
                         'format' => 'latex'
@@ -380,7 +381,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -390,7 +392,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'inanchor'
@@ -404,7 +405,8 @@ $result_trees{'commands_in_sc'} = {
                       'type' => 'spaces_after_close_brace'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hyphenation',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -414,7 +416,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'hyphenation',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 8
@@ -426,7 +427,8 @@ $result_trees{'commands_in_sc'} = {
                       'type' => 'spaces_after_close_brace'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'U',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -436,7 +438,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'U',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -445,7 +446,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -455,7 +457,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -464,7 +465,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -479,7 +481,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 9
@@ -489,7 +490,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -499,7 +501,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -508,7 +509,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -526,7 +528,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -535,7 +536,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'info' => {
                             'spaces_before_argument' => {
@@ -553,7 +555,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -563,7 +564,8 @@ $result_trees{'commands_in_sc'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'type' => 'brace_arg'
                         },
@@ -579,7 +581,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -588,7 +589,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -617,7 +619,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -626,7 +627,8 @@ $result_trees{'commands_in_sc'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -649,7 +651,6 @@ $result_trees{'commands_in_sc'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -658,7 +659,6 @@ $result_trees{'commands_in_sc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -682,10 +682,10 @@ $result_trees{'commands_in_sc'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$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_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 929731c2da..21b4aae62c 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
@@ -14,14 +14,16 @@ $result_trees{'commands_in_settitle_with_title'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'sc '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '~',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -31,7 +33,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '~',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -40,12 +41,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'aa',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'aa',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -54,12 +55,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'TeX',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'TeX',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -68,7 +69,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -77,7 +77,8 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' node '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -87,7 +88,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -96,11 +96,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -110,7 +112,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -119,7 +120,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -128,11 +128,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '=',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -142,7 +144,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '=',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -151,7 +152,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -160,12 +160,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -174,11 +174,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => ',',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -188,7 +190,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -197,7 +198,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => ',',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -206,12 +206,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 25fa53a46f..31c9b28f20 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -134,14 +134,16 @@ $result_trees{'commands_in_var'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -151,7 +153,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -160,12 +161,12 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -174,12 +175,12 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -188,7 +189,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -198,7 +200,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -210,7 +211,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -228,7 +230,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -237,7 +238,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'xref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -268,7 +270,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'xref',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -278,7 +279,8 @@ $result_trees{'commands_in_var'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -314,7 +316,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -323,7 +324,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'inlinefmtifelse',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -344,7 +346,8 @@ $result_trees{'commands_in_var'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'verb',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -355,7 +358,6 @@ $result_trees{'commands_in_var'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'verb',
                               'info' => {
                                 'delimiter' => '!'
                               },
@@ -367,7 +369,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'inlinefmtifelse',
                       'extra' => {
                         'expand_index' => 2,
                         'format' => 'latex'
@@ -380,7 +381,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -390,7 +392,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'inanchor'
@@ -404,7 +405,8 @@ $result_trees{'commands_in_var'} = {
                       'type' => 'spaces_after_close_brace'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hyphenation',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -414,7 +416,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'hyphenation',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 8
@@ -426,7 +427,8 @@ $result_trees{'commands_in_var'} = {
                       'type' => 'spaces_after_close_brace'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'U',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -436,7 +438,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'U',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -445,7 +446,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -455,7 +457,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -464,7 +465,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -479,7 +481,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 9
@@ -489,7 +490,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -499,7 +501,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -508,7 +509,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -526,7 +528,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -535,7 +536,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'info' => {
                             'spaces_before_argument' => {
@@ -553,7 +555,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -563,7 +564,8 @@ $result_trees{'commands_in_var'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'type' => 'brace_arg'
                         },
@@ -579,7 +581,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -588,7 +589,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -617,7 +619,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -626,7 +627,8 @@ $result_trees{'commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -649,7 +651,6 @@ $result_trees{'commands_in_var'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -658,7 +659,6 @@ $result_trees{'commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -682,10 +682,10 @@ $result_trees{'commands_in_var'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$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_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 c7ed62e7ac..e7f2745561 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -226,7 +226,8 @@ $result_trees{'complex_nestings'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -236,7 +237,6 @@ $result_trees{'complex_nestings'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 9
                                   }
@@ -256,12 +256,12 @@ $result_trees{'complex_nestings'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'dots',
+                                  'contents' => [
                                     {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'dots',
                                   'source_info' => {
                                     'line_nr' => 9
                                   }
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 fdc9d86b75..18b0905dcb 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -122,7 +122,8 @@ $result_trees{'conversion_with_undef_customization'} = {
               'text' => 'chap'
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'conversion_with_undef_customization'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -169,7 +169,8 @@ $result_trees{'conversion_with_undef_customization'} = {
               'text' => 'Chap'
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -179,7 +180,6 @@ $result_trees{'conversion_with_undef_customization'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -207,7 +207,8 @@ $result_trees{'conversion_with_undef_customization'} = {
               'text' => 'Text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -216,7 +217,8 @@ $result_trees{'conversion_with_undef_customization'} = {
                           'text' => 'Go '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -226,7 +228,6 @@ $result_trees{'conversion_with_undef_customization'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'samp',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -238,7 +239,6 @@ $result_trees{'conversion_with_undef_customization'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 10
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 914a5bc891..71731f62ee 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -252,7 +252,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn no var for '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -262,7 +263,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -271,7 +271,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' and '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -281,7 +282,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -387,7 +387,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -397,7 +398,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -417,7 +417,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -427,7 +428,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -483,7 +483,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn explict var for '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -493,7 +494,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -502,7 +502,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' and '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -512,7 +513,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -618,11 +618,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -632,7 +634,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 15
                                       }
@@ -641,7 +642,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -661,11 +661,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -675,7 +677,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 15
                                       }
@@ -684,7 +685,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -740,7 +740,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn r slanted for '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -750,7 +751,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -759,7 +759,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' and '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +770,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1088,7 +1088,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1098,7 +1099,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 20
                               }
@@ -1148,7 +1148,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1158,7 +1159,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 20
                               }
@@ -1187,7 +1187,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1197,7 +1198,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 20
                               }
@@ -1341,7 +1341,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1351,7 +1352,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 21
                               }
@@ -1401,7 +1401,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1411,7 +1412,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 21
                               }
@@ -1440,7 +1440,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1450,7 +1451,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 21
                               }
@@ -1594,7 +1594,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1604,7 +1605,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -1654,7 +1654,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1664,7 +1665,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -1693,7 +1693,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1703,7 +1704,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -1847,7 +1847,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1857,7 +1858,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 23
                               }
@@ -1907,7 +1907,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1917,7 +1918,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 23
                               }
@@ -1946,7 +1946,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1956,7 +1957,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 23
                               }
@@ -2100,7 +2100,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2110,7 +2111,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2160,7 +2160,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2170,7 +2171,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2199,7 +2199,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2209,7 +2210,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2353,11 +2353,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2367,7 +2369,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 25
                                       }
@@ -2376,7 +2377,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 25
                               }
@@ -2426,11 +2426,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2440,7 +2442,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 25
                                       }
@@ -2449,7 +2450,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 25
                               }
@@ -2478,11 +2478,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2492,7 +2494,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 25
                                       }
@@ -2501,7 +2502,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 25
                               }
@@ -2645,11 +2645,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2659,7 +2661,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 26
                                       }
@@ -2668,7 +2669,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 26
                               }
@@ -2718,11 +2718,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2732,7 +2734,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 26
                                       }
@@ -2741,7 +2742,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 26
                               }
@@ -2770,11 +2770,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2784,7 +2786,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 26
                                       }
@@ -2793,7 +2794,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 26
                               }
@@ -2937,11 +2937,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2951,7 +2953,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 27
                                       }
@@ -2960,7 +2961,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -3010,11 +3010,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3024,7 +3026,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 27
                                       }
@@ -3033,7 +3034,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -3062,11 +3062,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3076,7 +3078,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 27
                                       }
@@ -3085,7 +3086,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -3229,11 +3229,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3243,7 +3245,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 28
                                       }
@@ -3252,7 +3253,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -3302,11 +3302,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3316,7 +3318,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 28
                                       }
@@ -3325,7 +3326,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -3354,11 +3354,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3368,7 +3370,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 28
                                       }
@@ -3377,7 +3378,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -3521,11 +3521,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3535,7 +3537,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 29
                                       }
@@ -3544,7 +3545,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 29
                               }
@@ -3594,11 +3594,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3608,7 +3610,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 29
                                       }
@@ -3617,7 +3618,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 29
                               }
@@ -3646,11 +3646,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3660,7 +3662,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 29
                                       }
@@ -3669,7 +3670,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 29
                               }
@@ -3813,11 +3813,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3827,7 +3829,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 30
                                       }
@@ -3836,7 +3837,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 30
                               }
@@ -3886,11 +3886,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3900,7 +3902,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 30
                                       }
@@ -3909,7 +3910,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 30
                               }
@@ -3938,11 +3938,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3952,7 +3954,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 30
                                       }
@@ -3961,7 +3962,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 30
                               }
@@ -4105,11 +4105,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4119,7 +4121,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 31
                                       }
@@ -4128,7 +4129,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -4178,11 +4178,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4192,7 +4194,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 31
                                       }
@@ -4201,7 +4202,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -4230,11 +4230,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4244,7 +4246,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 31
                                       }
@@ -4253,7 +4254,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -4397,11 +4397,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4411,7 +4413,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 32
                                       }
@@ -4420,7 +4421,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -4470,11 +4470,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4484,7 +4486,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 32
                                       }
@@ -4493,7 +4494,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -4522,11 +4522,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4536,7 +4538,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 32
                                       }
@@ -4545,7 +4546,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -4689,11 +4689,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4703,7 +4705,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 33
                                       }
@@ -4712,7 +4713,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 33
                               }
@@ -4762,11 +4762,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4776,7 +4778,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 33
                                       }
@@ -4785,7 +4786,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 33
                               }
@@ -4814,11 +4814,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -4828,7 +4830,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 33
                                       }
@@ -4837,7 +4838,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 33
                               }
@@ -5133,7 +5133,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5143,7 +5144,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 38
                               }
@@ -5262,7 +5262,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5272,7 +5273,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 39
                               }
@@ -5391,7 +5391,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5401,7 +5402,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 40
                               }
@@ -5520,7 +5520,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5530,7 +5531,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 41
                               }
@@ -5649,8 +5649,9 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
+                              'cmdname' => 't',
+                              'contents' => [
+                                {
                                   'contents' => [
                                     {
                                       'text' => 'va---riable'
@@ -5659,7 +5660,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 42
                               }
@@ -5778,11 +5778,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -5792,7 +5794,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 43
                                       }
@@ -5801,7 +5802,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 43
                               }
@@ -5920,11 +5920,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -5934,7 +5936,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 44
                                       }
@@ -5943,7 +5944,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 44
                               }
@@ -6062,11 +6062,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6076,7 +6078,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 45
                                       }
@@ -6085,7 +6086,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 45
                               }
@@ -6204,11 +6204,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6218,7 +6220,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 46
                                       }
@@ -6227,7 +6228,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 46
                               }
@@ -6346,11 +6346,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6360,7 +6362,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 47
                                       }
@@ -6369,7 +6370,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 47
                               }
@@ -6488,11 +6488,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6502,7 +6504,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 48
                                       }
@@ -6511,7 +6512,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 48
                               }
@@ -6630,11 +6630,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6644,7 +6646,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 49
                                       }
@@ -6653,7 +6654,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 49
                               }
@@ -6772,11 +6772,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6786,7 +6788,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 50
                                       }
@@ -6795,7 +6796,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 50
                               }
@@ -6914,11 +6914,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -6928,7 +6930,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 51
                                       }
@@ -6937,7 +6938,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 51
                               }
@@ -7095,7 +7095,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7105,7 +7106,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 55
                               }
@@ -7129,11 +7129,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -7143,7 +7145,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 55
                                       }
@@ -7152,7 +7153,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 55
                               }
@@ -7184,7 +7184,8 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7193,8 +7194,7 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -7226,12 +7226,12 @@ $result_trees{'definition_commands'} = {
                               'text' => 'Escape'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'tie',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'tie',
                               'source_info' => {
                                 'line_nr' => 56
                               }
@@ -7254,7 +7254,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7264,17 +7265,18 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 56
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -7284,7 +7286,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 56
                                       }
@@ -7293,18 +7294,17 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 56
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 56
                               }
@@ -7333,7 +7333,8 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7342,15 +7343,16 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'slanted',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -7359,22 +7361,20 @@ $result_trees{'definition_commands'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'slanted'
+                                  ]
                                 }
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'r'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -7410,12 +7410,12 @@ $result_trees{'definition_commands'} = {
                               'text' => 'Escape'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'tie',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'tie',
                               'source_info' => {
                                 'line_nr' => 57
                               }
@@ -7438,7 +7438,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7448,17 +7449,18 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 57
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -7468,7 +7470,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 57
                                       }
@@ -7477,18 +7478,17 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 57
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 57
                               }
@@ -7517,7 +7517,8 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7526,15 +7527,16 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'slanted',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -7543,22 +7545,20 @@ $result_trees{'definition_commands'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'slanted'
+                                  ]
                                 }
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'r'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -7594,12 +7594,12 @@ $result_trees{'definition_commands'} = {
                               'text' => 'Escape'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'tie',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'tie',
                               'source_info' => {
                                 'line_nr' => 58
                               }
@@ -7622,7 +7622,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7632,17 +7633,18 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 58
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -7652,7 +7654,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 58
                                       }
@@ -7661,13 +7662,13 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 58
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7677,7 +7678,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 58
                               }
@@ -7697,7 +7697,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7707,7 +7708,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 58
                               }
@@ -7723,11 +7723,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -7737,7 +7739,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 58
                                       }
@@ -7746,7 +7747,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 58
                               }
@@ -7762,7 +7762,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7772,7 +7773,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 58
                               }
@@ -7801,7 +7801,8 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7810,15 +7811,16 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'slanted',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -7827,17 +7829,16 @@ $result_trees{'definition_commands'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'slanted'
+                                  ]
                                 }
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'r'
+                          ]
                         },
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7846,8 +7847,7 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -7897,7 +7897,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7907,7 +7908,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 59
                               }
@@ -7936,7 +7936,8 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 't',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -7945,8 +7946,7 @@ $result_trees{'definition_commands'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 't'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -7978,7 +7978,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'The '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -7988,7 +7989,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 60
                       }
@@ -7997,7 +7997,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' request and the '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8007,7 +8008,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 60
                       }
@@ -8020,7 +8020,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'to '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8030,7 +8031,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 61
                       }
@@ -8039,18 +8039,19 @@ $result_trees{'definition_commands'} = {
                       'text' => ' (one-character name'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 61
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8060,7 +8061,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 61
                       }
@@ -8070,7 +8070,8 @@ $result_trees{'definition_commands'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8080,7 +8081,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 62
                       }
@@ -8200,7 +8200,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8210,7 +8211,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8230,7 +8230,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8240,7 +8241,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8260,7 +8260,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8270,7 +8271,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8290,7 +8290,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8300,7 +8301,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8320,11 +8320,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8334,7 +8336,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8343,7 +8344,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8363,11 +8363,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8377,7 +8379,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8386,7 +8387,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8406,15 +8406,18 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => 'slanted',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -8424,7 +8427,6 @@ $result_trees{'definition_commands'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => 'slanted',
                                               'source_info' => {
                                                 'line_nr' => 65
                                               }
@@ -8433,7 +8435,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8442,7 +8443,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8462,11 +8462,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8476,7 +8478,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8485,7 +8486,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8513,7 +8513,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8523,7 +8524,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8543,7 +8543,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8553,7 +8554,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8573,7 +8573,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8583,7 +8584,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8603,7 +8603,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8613,7 +8614,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8633,11 +8633,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8647,7 +8649,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8656,7 +8657,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8676,11 +8676,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8690,7 +8692,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8699,7 +8700,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8719,15 +8719,18 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => 'slanted',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -8737,7 +8740,6 @@ $result_trees{'definition_commands'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => 'slanted',
                                               'source_info' => {
                                                 'line_nr' => 65
                                               }
@@ -8746,7 +8748,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8755,7 +8756,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8775,11 +8775,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8789,7 +8791,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8798,7 +8799,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8826,7 +8826,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8836,7 +8837,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8856,7 +8856,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8866,7 +8867,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8886,7 +8886,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8896,7 +8897,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8916,7 +8916,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8926,7 +8927,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8946,11 +8946,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -8960,7 +8962,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -8969,7 +8970,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -8989,11 +8989,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -9003,7 +9005,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -9012,7 +9013,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -9032,15 +9032,18 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => 'slanted',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -9050,7 +9053,6 @@ $result_trees{'definition_commands'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => 'slanted',
                                               'source_info' => {
                                                 'line_nr' => 65
                                               }
@@ -9059,7 +9061,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -9068,7 +9069,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -9088,11 +9088,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -9102,7 +9104,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 65
                                       }
@@ -9111,7 +9112,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -9220,7 +9220,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9230,7 +9231,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9250,7 +9250,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9260,7 +9261,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9280,7 +9280,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9290,7 +9291,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9310,7 +9310,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9320,7 +9321,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9340,11 +9340,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -9354,7 +9356,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 66
                                       }
@@ -9363,7 +9364,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9383,11 +9383,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -9397,7 +9399,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 66
                                       }
@@ -9406,7 +9407,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9426,15 +9426,18 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => 'slanted',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -9444,7 +9447,6 @@ $result_trees{'definition_commands'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => 'slanted',
                                               'source_info' => {
                                                 'line_nr' => 66
                                               }
@@ -9453,7 +9455,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 66
                                       }
@@ -9462,7 +9463,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 66
                               }
@@ -9661,7 +9661,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9671,7 +9672,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 70
                               }
@@ -9712,7 +9712,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9722,7 +9723,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 70
                               }
@@ -9779,12 +9779,12 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -9793,7 +9793,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' with var for '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -9803,7 +9804,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -9812,7 +9812,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' and '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -9822,7 +9823,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -9969,11 +9969,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -9983,7 +9985,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 74
                                       }
@@ -9992,7 +9993,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 74
                               }
@@ -10033,11 +10033,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -10047,7 +10049,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 74
                                       }
@@ -10056,7 +10057,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 74
                               }
@@ -10113,12 +10113,12 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 75
                       }
@@ -10127,7 +10127,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' with r slanted for '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10137,7 +10138,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 75
                       }
@@ -10146,7 +10146,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' and '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10156,7 +10157,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 75
                       }
@@ -10337,12 +10337,12 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 80
                       }
@@ -10451,7 +10451,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10461,7 +10462,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 83
                               }
@@ -10584,12 +10584,12 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 84
                       }
@@ -10750,7 +10750,8 @@ $result_trees{'definition_commands'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -10760,7 +10761,6 @@ $result_trees{'definition_commands'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 88
                                   }
@@ -10801,7 +10801,8 @@ $result_trees{'definition_commands'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -10811,7 +10812,6 @@ $result_trees{'definition_commands'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 88
                                   }
@@ -10868,12 +10868,12 @@ $result_trees{'definition_commands'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dots',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dots',
                           'source_info' => {
                             'line_nr' => 89
                           }
@@ -10882,7 +10882,8 @@ $result_trees{'definition_commands'} = {
                           'text' => ' for '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10892,7 +10893,6 @@ $result_trees{'definition_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 89
                           }
@@ -10901,7 +10901,8 @@ $result_trees{'definition_commands'} = {
                           'text' => ' and '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10911,7 +10912,6 @@ $result_trees{'definition_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 89
                           }
@@ -11142,7 +11142,8 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11152,7 +11153,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 94
                       }
@@ -11161,7 +11161,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' calls no var '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11171,7 +11172,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 94
                       }
@@ -11180,7 +11180,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' with '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11190,7 +11191,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 94
                       }
@@ -11319,11 +11319,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -11333,7 +11335,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 97
                                       }
@@ -11342,7 +11343,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 97
                               }
@@ -11415,7 +11415,8 @@ $result_trees{'definition_commands'} = {
                       'text' => 'explicit keyword marking, no var '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11425,7 +11426,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 98
                       }
@@ -11434,7 +11434,8 @@ $result_trees{'definition_commands'} = {
                       'text' => ' with '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11444,7 +11445,6 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 98
                       }
@@ -11567,7 +11567,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11577,7 +11578,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11597,7 +11597,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11607,7 +11608,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11627,7 +11627,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11637,7 +11638,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11678,7 +11678,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11688,7 +11689,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11712,7 +11712,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11722,7 +11723,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11746,7 +11746,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11756,7 +11757,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -11787,7 +11787,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11797,7 +11798,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 102
                               }
@@ -11821,7 +11821,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11831,7 +11832,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 102
                               }
@@ -12037,7 +12037,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12047,7 +12048,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 106
                               }
@@ -12092,7 +12092,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12102,7 +12103,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 106
                               }
@@ -12259,7 +12259,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12269,7 +12270,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -12285,7 +12285,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12295,7 +12296,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -12336,7 +12336,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12346,7 +12347,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -12362,7 +12362,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12372,7 +12373,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -12530,7 +12530,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12540,7 +12541,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 108
                               }
@@ -12556,7 +12556,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12566,7 +12567,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 108
                               }
@@ -12607,7 +12607,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12617,7 +12618,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 108
                               }
@@ -12633,7 +12633,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12643,7 +12644,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 108
                               }
@@ -12801,7 +12801,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12811,7 +12812,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 109
                               }
@@ -12827,7 +12827,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12837,7 +12838,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 109
                               }
@@ -12878,7 +12878,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12888,7 +12889,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 109
                               }
@@ -12904,7 +12904,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12914,7 +12915,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 109
                               }
@@ -13072,7 +13072,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13082,7 +13083,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -13098,7 +13098,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13108,7 +13109,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -13149,7 +13149,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13159,7 +13160,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -13175,7 +13175,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13185,7 +13186,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -13343,7 +13343,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13353,7 +13354,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 111
                               }
@@ -13369,7 +13369,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13379,7 +13380,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 111
                               }
@@ -13420,7 +13420,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13430,7 +13431,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 111
                               }
@@ -13446,7 +13446,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13456,7 +13457,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 111
                               }
@@ -13614,7 +13614,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13624,7 +13625,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 112
                               }
@@ -13640,11 +13640,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -13654,7 +13656,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 112
                                       }
@@ -13663,7 +13664,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 112
                               }
@@ -13704,7 +13704,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13714,7 +13715,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 112
                               }
@@ -13730,11 +13730,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -13744,7 +13746,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 112
                                       }
@@ -13753,7 +13754,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 112
                               }
@@ -13911,7 +13911,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13921,7 +13922,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -13937,11 +13937,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -13951,7 +13953,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 113
                                       }
@@ -13960,7 +13961,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -14001,7 +14001,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14011,7 +14012,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -14027,11 +14027,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14041,7 +14043,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 113
                                       }
@@ -14050,7 +14051,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -14208,7 +14208,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14218,7 +14219,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 114
                               }
@@ -14234,11 +14234,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14248,7 +14250,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 114
                                       }
@@ -14257,7 +14258,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 114
                               }
@@ -14298,7 +14298,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14308,7 +14309,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 114
                               }
@@ -14324,11 +14324,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14338,7 +14340,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 114
                                       }
@@ -14347,7 +14348,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 114
                               }
@@ -14505,7 +14505,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14515,7 +14516,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 115
                               }
@@ -14531,11 +14531,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14545,7 +14547,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 115
                                       }
@@ -14554,7 +14555,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 115
                               }
@@ -14595,7 +14595,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14605,7 +14606,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 115
                               }
@@ -14621,11 +14621,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14635,7 +14637,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 115
                                       }
@@ -14644,7 +14645,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 115
                               }
@@ -14802,7 +14802,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14812,7 +14813,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -14828,11 +14828,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14842,7 +14844,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 116
                                       }
@@ -14851,7 +14852,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -14892,7 +14892,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -14902,7 +14903,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -14918,11 +14918,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -14932,7 +14934,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 116
                                       }
@@ -14941,7 +14942,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -15099,7 +15099,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15109,7 +15110,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 117
                               }
@@ -15125,11 +15125,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15139,7 +15141,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 117
                                       }
@@ -15148,7 +15149,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 117
                               }
@@ -15189,7 +15189,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15199,7 +15200,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 117
                               }
@@ -15215,11 +15215,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15229,7 +15231,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 117
                                       }
@@ -15238,7 +15239,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 117
                               }
@@ -15396,7 +15396,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15406,7 +15407,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 118
                               }
@@ -15422,11 +15422,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15436,7 +15438,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 118
                                       }
@@ -15445,7 +15446,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 118
                               }
@@ -15486,7 +15486,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15496,7 +15497,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 118
                               }
@@ -15512,11 +15512,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15526,7 +15528,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 118
                                       }
@@ -15535,7 +15536,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 118
                               }
@@ -15693,7 +15693,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15703,7 +15704,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -15719,11 +15719,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15733,7 +15735,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 119
                                       }
@@ -15742,7 +15743,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -15783,7 +15783,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -15793,7 +15794,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -15809,11 +15809,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -15823,7 +15825,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 119
                                       }
@@ -15832,7 +15833,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -15990,7 +15990,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16000,7 +16001,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 120
                               }
@@ -16016,11 +16016,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -16030,7 +16032,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 120
                                       }
@@ -16039,7 +16040,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 120
                               }
@@ -16080,7 +16080,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16090,7 +16091,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 120
                               }
@@ -16106,11 +16106,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -16120,7 +16122,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 120
                                       }
@@ -16129,7 +16130,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 120
                               }
@@ -16349,7 +16349,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16359,7 +16360,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 124
                               }
@@ -16404,7 +16404,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16414,7 +16415,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 124
                               }
@@ -16554,7 +16554,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16564,7 +16565,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -16584,7 +16584,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16594,7 +16595,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -16639,7 +16639,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16649,7 +16650,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -16794,7 +16794,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16804,7 +16805,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 126
                               }
@@ -16824,7 +16824,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16834,7 +16835,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 126
                               }
@@ -16879,7 +16879,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -16889,7 +16890,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 126
                               }
@@ -17034,7 +17034,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'slanted',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17044,7 +17045,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'slanted',
                               'source_info' => {
                                 'line_nr' => 127
                               }
@@ -17064,7 +17064,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17074,7 +17075,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 127
                               }
@@ -17119,7 +17119,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17129,7 +17130,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 127
                               }
@@ -17274,7 +17274,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17284,7 +17285,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -17304,7 +17304,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17314,7 +17315,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -17359,7 +17359,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17369,7 +17370,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -17514,7 +17514,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17524,7 +17525,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 129
                               }
@@ -17544,7 +17544,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17554,7 +17555,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 129
                               }
@@ -17599,7 +17599,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17609,7 +17610,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 129
                               }
@@ -17754,11 +17754,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'b',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -17768,7 +17770,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'b',
                                       'source_info' => {
                                         'line_nr' => 130
                                       }
@@ -17777,7 +17778,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 130
                               }
@@ -17797,7 +17797,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17807,7 +17808,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 130
                               }
@@ -17852,7 +17852,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -17862,7 +17863,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 130
                               }
@@ -18007,11 +18007,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -18021,7 +18023,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 131
                                       }
@@ -18030,7 +18031,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -18050,7 +18050,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18060,7 +18061,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -18105,7 +18105,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18115,7 +18116,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -18260,11 +18260,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -18274,7 +18276,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 132
                                       }
@@ -18283,7 +18284,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 132
                               }
@@ -18303,7 +18303,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18313,7 +18314,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 132
                               }
@@ -18358,7 +18358,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18368,7 +18369,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 132
                               }
@@ -18513,11 +18513,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -18527,7 +18529,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 133
                                       }
@@ -18536,7 +18537,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 133
                               }
@@ -18556,7 +18556,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18566,7 +18567,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 133
                               }
@@ -18611,7 +18611,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18621,7 +18622,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 133
                               }
@@ -18766,11 +18766,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 't',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -18780,7 +18782,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 't',
                                       'source_info' => {
                                         'line_nr' => 134
                                       }
@@ -18789,7 +18790,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -18809,7 +18809,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18819,7 +18820,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -18864,7 +18864,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -18874,7 +18875,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -19019,11 +19019,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -19033,7 +19035,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 135
                                       }
@@ -19042,7 +19043,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 135
                               }
@@ -19062,7 +19062,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19072,7 +19073,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 135
                               }
@@ -19117,7 +19117,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19127,7 +19128,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 135
                               }
@@ -19272,11 +19272,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -19286,7 +19288,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 136
                                       }
@@ -19295,7 +19296,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 136
                               }
@@ -19315,7 +19315,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19325,7 +19326,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 136
                               }
@@ -19370,7 +19370,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19380,7 +19381,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 136
                               }
@@ -19525,11 +19525,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -19539,7 +19541,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 137
                                       }
@@ -19548,7 +19549,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -19568,7 +19568,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19578,7 +19579,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -19623,7 +19623,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19633,7 +19634,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -19778,11 +19778,13 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'slanted',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -19792,7 +19794,6 @@ $result_trees{'definition_commands'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'slanted',
                                       'source_info' => {
                                         'line_nr' => 138
                                       }
@@ -19801,7 +19802,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 138
                               }
@@ -19821,7 +19821,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19831,7 +19832,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 138
                               }
@@ -19876,7 +19876,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -19886,7 +19887,6 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 138
                               }
diff --git a/tp/t/results/converters_tests/empty_accent.pl 
b/tp/t/results/converters_tests/empty_accent.pl
index a216d35ec8..cd8cff9483 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -12,12 +12,12 @@ $result_trees{'empty_accent'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index 77f12a6557..f746b4840c 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -137,7 +137,8 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'Para'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -152,7 +153,6 @@ $result_trees{'footnote_no_number'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 7
@@ -176,7 +176,8 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'Para2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -191,7 +192,6 @@ $result_trees{'footnote_no_number'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
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 b615ba1f12..049df1dc63 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -137,7 +137,8 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'Para'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -152,7 +153,6 @@ $result_trees{'footnote_no_number_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 7
@@ -176,7 +176,8 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'Para2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -191,7 +192,6 @@ $result_trees{'footnote_no_number_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 73811ead3e..0ae2f648bb 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -141,7 +141,8 @@ $result_trees{'form_feeds'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -151,7 +152,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -171,7 +171,8 @@ $result_trees{'form_feeds'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -201,7 +201,8 @@ $result_trees{'form_feeds'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -211,7 +212,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -229,7 +229,8 @@ $result_trees{'form_feeds'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -239,7 +240,6 @@ $result_trees{'form_feeds'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'aa'
@@ -258,7 +258,8 @@ $result_trees{'form_feeds'} = {
               'text' => 'something '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -286,13 +287,13 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 17
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -315,7 +316,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -331,7 +331,8 @@ $result_trees{'form_feeds'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -358,7 +359,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -384,7 +384,8 @@ $result_trees{'form_feeds'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -402,7 +403,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -544,7 +544,8 @@ $result_trees{'form_feeds'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -554,7 +555,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1032,7 +1032,8 @@ $result_trees{'form_feeds'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1067,7 +1068,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1094,7 +1094,8 @@ $result_trees{'form_feeds'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1129,7 +1130,6 @@ $result_trees{'form_feeds'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -1346,7 +1346,7 @@ $result_trees{'form_feeds'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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'}[1]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index aaf53346f6..3c35d7670f 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -192,7 +192,8 @@ $result_trees{'frenchspacing_and_code'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -202,7 +203,6 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -425,7 +425,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -435,7 +436,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 18
                               }
@@ -455,7 +455,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -465,7 +466,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 18
                               }
@@ -748,7 +748,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -758,7 +759,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -778,7 +778,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -788,7 +789,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -1065,7 +1065,8 @@ $result_trees{'frenchspacing_and_code'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1075,7 +1076,6 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -1298,7 +1298,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1308,7 +1309,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 38
                               }
@@ -1328,7 +1328,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1338,7 +1339,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 38
                               }
@@ -1621,7 +1621,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1631,7 +1632,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 42
                               }
@@ -1651,7 +1651,8 @@ $result_trees{'frenchspacing_and_code'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1661,7 +1662,6 @@ $result_trees{'frenchspacing_and_code'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 42
                               }
diff --git a/tp/t/results/converters_tests/image_extension.pl 
b/tp/t/results/converters_tests/image_extension.pl
index c28dbd54bd..3c28c0bd86 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -10,7 +10,8 @@ $result_trees{'image_extension'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -37,7 +38,6 @@ $result_trees{'image_extension'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 39b34b1f0b..093f4fa312 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -134,7 +134,8 @@ $result_trees{'image_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -165,7 +165,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -175,7 +176,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -188,7 +188,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -210,7 +211,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -219,7 +219,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -250,7 +250,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -272,7 +273,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -281,7 +281,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -302,7 +303,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -315,7 +315,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -337,7 +338,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -346,7 +346,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -370,7 +371,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -383,7 +383,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -405,7 +406,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -414,7 +414,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -454,7 +454,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -476,7 +477,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -485,7 +485,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -527,7 +528,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -540,7 +540,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -559,7 +560,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -568,7 +568,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -605,7 +606,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -618,7 +618,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -640,7 +641,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -649,7 +649,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -678,7 +679,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -691,7 +691,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -758,7 +759,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -767,11 +767,13 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -781,7 +783,6 @@ $result_trees{'image_formatting'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -822,7 +823,8 @@ $result_trees{'image_formatting'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -832,7 +834,6 @@ $result_trees{'image_formatting'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -847,7 +848,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -860,7 +860,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -870,7 +871,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -882,7 +882,8 @@ $result_trees{'image_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -892,7 +893,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -929,7 +929,8 @@ $result_trees{'image_formatting'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -951,7 +952,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 19
                   }
@@ -960,7 +960,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -970,7 +971,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -983,7 +983,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1005,7 +1006,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 20
                   }
@@ -1014,7 +1014,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1032,7 +1033,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1045,7 +1045,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1067,7 +1068,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 21
                   }
@@ -1076,7 +1076,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1097,7 +1098,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1110,7 +1110,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1132,7 +1133,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 22
                   }
@@ -1141,7 +1141,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1165,7 +1166,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1178,7 +1178,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1200,7 +1201,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 23
                   }
@@ -1209,7 +1209,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1236,7 +1237,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1249,7 +1249,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1271,7 +1272,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 24
                   }
@@ -1280,7 +1280,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1322,7 +1323,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1335,7 +1335,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1357,7 +1358,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 25
                   }
@@ -1366,7 +1366,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1395,7 +1396,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1408,7 +1408,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1475,7 +1476,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 26
                   }
@@ -1484,11 +1484,13 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'file',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1498,7 +1500,6 @@ $result_trees{'image_formatting'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'file',
                           'source_info' => {
                             'line_nr' => 26
                           }
@@ -1539,7 +1540,8 @@ $result_trees{'image_formatting'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'file',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1549,7 +1551,6 @@ $result_trees{'image_formatting'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'file',
                           'source_info' => {
                             'line_nr' => 26
                           }
@@ -1564,7 +1565,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1577,7 +1577,8 @@ $result_trees{'image_formatting'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1587,7 +1588,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1599,7 +1599,8 @@ $result_trees{'image_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1609,7 +1610,6 @@ $result_trees{'image_formatting'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1665,7 +1665,8 @@ $result_trees{'image_formatting'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -1689,7 +1690,6 @@ $result_trees{'image_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -1713,7 +1713,8 @@ $result_trees{'image_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1737,7 +1738,6 @@ $result_trees{'image_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl 
b/tp/t/results/converters_tests/image_with_spaces.pl
index 60e7f29025..2a32309852 100644
Binary files a/tp/t/results/converters_tests/image_with_spaces.pl and 
b/tp/t/results/converters_tests/image_with_spaces.pl differ
diff --git a/tp/t/results/converters_tests/inline.pl 
b/tp/t/results/converters_tests/inline.pl
index 2ee82942ea..fbc3be14ac 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -17,7 +17,8 @@ $result_trees{'inline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -40,7 +41,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -54,7 +54,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -77,7 +78,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -91,7 +91,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -114,7 +115,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'xml'
@@ -128,7 +128,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -151,7 +152,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'docbook'
@@ -165,7 +165,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'inline'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
@@ -197,7 +197,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -209,7 +210,8 @@ $result_trees{'inline'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -221,7 +223,8 @@ $result_trees{'inline'} = {
                                   'text' => '{a < b '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'code',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -242,7 +245,6 @@ $result_trees{'inline'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'code',
                                   'source_info' => {
                                     'line_nr' => 7
                                   }
@@ -271,7 +273,6 @@ $result_trees{'inline'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -288,7 +289,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'latex'
@@ -317,7 +317,8 @@ $result_trees{'inline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -340,7 +341,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -354,7 +354,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -377,7 +378,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -391,7 +391,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -414,7 +415,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'xml'
@@ -428,7 +428,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -451,7 +452,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'docbook'
@@ -465,7 +465,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -484,7 +485,6 @@ $result_trees{'inline'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'tex'
               },
@@ -497,7 +497,8 @@ $result_trees{'inline'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -517,7 +518,8 @@ $result_trees{'inline'} = {
                           'text' => '{a < b '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -538,7 +540,6 @@ $result_trees{'inline'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 15
                           }
@@ -575,7 +576,6 @@ $result_trees{'inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl 
b/tp/t/results/converters_tests/inline_expand_tex.pl
index c9d1716b88..16347c026c 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -17,7 +17,8 @@ $result_trees{'inline_expand_tex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,7 +37,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'html'
               },
@@ -49,7 +49,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -68,7 +69,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'plaintext'
               },
@@ -81,7 +81,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +101,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'xml'
               },
@@ -113,7 +113,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'docbook'
               },
@@ -145,7 +145,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -160,7 +161,8 @@ $result_trees{'inline_expand_tex'} = {
                       'text' => '$\\underlinea < b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -170,7 +172,6 @@ $result_trees{'inline_expand_tex'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -184,7 +185,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'tex'
@@ -198,7 +198,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -217,7 +218,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'latex'
               },
@@ -245,7 +245,8 @@ $result_trees{'inline_expand_tex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -264,7 +265,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'html'
               },
@@ -277,7 +277,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -296,7 +297,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'plaintext'
               },
@@ -309,7 +309,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -328,7 +329,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'xml'
               },
@@ -341,7 +341,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -360,7 +361,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'docbook'
               },
@@ -373,7 +373,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,8 @@ $result_trees{'inline_expand_tex'} = {
                           'text' => '{a < b '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -414,7 +416,6 @@ $result_trees{'inline_expand_tex'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -440,7 +441,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'tex'
@@ -454,7 +454,8 @@ $result_trees{'inline_expand_tex'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -473,7 +474,6 @@ $result_trees{'inline_expand_tex'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'latex'
               },
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl 
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 677a3a2525..cc69b46c47 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -39,7 +40,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
@@ -53,7 +53,8 @@ $result_trees{'inlinefmtifelse'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -80,7 +81,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
@@ -104,7 +104,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -123,7 +124,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'plaintext'
@@ -137,7 +137,8 @@ $result_trees{'inlinefmtifelse'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'plaintext'
@@ -188,7 +188,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -210,7 +211,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'xml'
@@ -234,7 +234,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -274,7 +275,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'docbook'
@@ -298,7 +298,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -338,7 +339,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
@@ -362,7 +362,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -389,7 +390,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'docbook'
@@ -413,7 +413,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -440,7 +441,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
@@ -464,7 +464,8 @@ $result_trees{'inlinefmtifelse'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -491,7 +492,6 @@ $result_trees{'inlinefmtifelse'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl 
b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
index 0816b93867..7925a18eb2 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,7 +37,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'text' => 'else '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -46,7 +48,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -55,7 +56,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
@@ -79,7 +79,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -103,7 +104,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'text' => 'else '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -113,7 +115,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -122,7 +123,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'plaintext'
@@ -146,7 +146,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -170,7 +171,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'text' => 'xml '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -180,7 +182,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -194,7 +195,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'xml'
@@ -218,7 +218,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -250,7 +251,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                       'text' => 'else '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -260,7 +262,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -277,7 +278,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'docbook'
@@ -301,7 +301,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -322,7 +323,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -332,7 +334,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -344,7 +345,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
@@ -368,7 +368,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -389,7 +390,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -399,7 +401,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -411,7 +412,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl 
b/tp/t/results/converters_tests/inlinefmtspaces.pl
index 503beb3ee8..bce919ec28 100644
--- a/tp/t/results/converters_tests/inlinefmtspaces.pl
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinefmtspaces'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -38,12 +39,12 @@ $result_trees{'inlinefmtspaces'} = {
                       'text' => 'plaintext `` '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -60,7 +61,6 @@ $result_trees{'inlinefmtspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -79,7 +79,8 @@ $result_trees{'inlinefmtspaces'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -102,7 +103,8 @@ $result_trees{'inlinefmtspaces'} = {
                       'text' => 'in <i>'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -112,7 +114,6 @@ $result_trees{'inlinefmtspaces'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -129,7 +130,6 @@ $result_trees{'inlinefmtspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl 
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index e4933b9645..4582e4bfef 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifsetifclear'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -35,7 +36,6 @@ $result_trees{'inlineifsetifclear'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'aaa'
@@ -59,7 +59,8 @@ $result_trees{'inlineifsetifclear'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -78,7 +79,6 @@ $result_trees{'inlineifsetifclear'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'aaa'
               },
@@ -123,7 +123,8 @@ $result_trees{'inlineifsetifclear'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'inlineifsetifclear'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'format' => 'aaa'
               },
@@ -165,7 +165,8 @@ $result_trees{'inlineifsetifclear'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -188,7 +189,6 @@ $result_trees{'inlineifsetifclear'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'aaa'
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl 
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index b779dc6a75..3d3ad8e074 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -43,7 +44,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'aaa'
@@ -73,7 +73,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +101,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'aaa'
               },
@@ -151,7 +151,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -178,7 +179,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'format' => 'aaa'
               },
@@ -206,7 +206,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'aaa'
diff --git a/tp/t/results/converters_tests/inlinerawspaces.pl 
b/tp/t/results/converters_tests/inlinerawspaces.pl
index 5a147156a8..b91a374baa 100644
--- a/tp/t/results/converters_tests/inlinerawspaces.pl
+++ b/tp/t/results/converters_tests/inlinerawspaces.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinerawspaces'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -38,12 +39,12 @@ $result_trees{'inlinerawspaces'} = {
                       'text' => 'plaintext `` '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -60,7 +61,6 @@ $result_trees{'inlinerawspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -74,7 +74,8 @@ $result_trees{'inlinerawspaces'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -97,7 +98,8 @@ $result_trees{'inlinerawspaces'} = {
                       'text' => 'in <i>'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -107,7 +109,6 @@ $result_trees{'inlinerawspaces'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -124,7 +125,6 @@ $result_trees{'inlinerawspaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/converters_tests/link.pl 
b/tp/t/results/converters_tests/link.pl
index 9c41c26861..a26b1f4da3 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -165,7 +165,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -183,7 +184,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -203,7 +203,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -234,7 +235,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -300,7 +300,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -318,7 +319,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -338,7 +338,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -369,7 +370,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -403,7 +403,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -431,7 +432,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -451,7 +451,8 @@ $result_trees{'link'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'link',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -484,7 +485,6 @@ $result_trees{'link'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'link',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -513,12 +513,12 @@ $result_trees{'link'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'link'} = '@node One
 @chapter ONEX
diff --git a/tp/t/results/converters_tests/multitable_prototypes.pl 
b/tp/t/results/converters_tests/multitable_prototypes.pl
index 75c6061d16..daed15b097 100644
--- a/tp/t/results/converters_tests/multitable_prototypes.pl
+++ b/tp/t/results/converters_tests/multitable_prototypes.pl
@@ -52,7 +52,8 @@ $result_trees{'multitable_prototypes'} = {
                       'text' => 'j '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -62,7 +63,6 @@ $result_trees{'multitable_prototypes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -80,7 +80,8 @@ $result_trees{'multitable_prototypes'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -90,7 +91,6 @@ $result_trees{'multitable_prototypes'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -175,7 +175,8 @@ $result_trees{'multitable_prototypes'} = {
                               'text' => 'k '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'samp',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -185,7 +186,6 @@ $result_trees{'multitable_prototypes'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'samp',
                               'source_info' => {
                                 'line_nr' => 4
                               }
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl 
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index 758ea5af42..049fde396a 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -29,14 +29,16 @@ $result_trees{'normal_font_in_monospace'} = {
                   'text' => 'in example '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in r---now '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -46,7 +48,6 @@ $result_trees{'normal_font_in_monospace'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -55,7 +56,6 @@ $result_trees{'normal_font_in_monospace'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -110,21 +110,24 @@ $result_trees{'normal_font_in_monospace'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in command---c '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'in r---r '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'file',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -134,7 +137,6 @@ $result_trees{'normal_font_in_monospace'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'file',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -143,7 +145,6 @@ $result_trees{'normal_font_in_monospace'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -152,7 +153,6 @@ $result_trees{'normal_font_in_monospace'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index c54329b8ae..23b5f1b144 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -223,7 +223,8 @@ $result_trees{'raw_block_commands'} = {
                   'text' => '$\\underline{a < b '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -244,7 +245,6 @@ $result_trees{'raw_block_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -316,7 +316,8 @@ $result_trees{'raw_block_commands'} = {
                   'text' => '$\\frac{a < b '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -337,7 +338,6 @@ $result_trees{'raw_block_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 19
                   }
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl 
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index a932608dee..edc086403c 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -223,7 +223,8 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'text' => '$\\underline{a < b '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -244,7 +245,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -316,7 +316,8 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'text' => '$\\frac{a < b '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -337,7 +338,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 19
                   }
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 61c42c250b..8c596fe9b2 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -17,7 +17,8 @@ $result_trees{'ref_error_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -39,7 +40,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -48,7 +48,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -66,7 +67,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -86,7 +86,8 @@ $result_trees{'ref_error_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -108,7 +109,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -117,7 +117,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -130,7 +131,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -140,7 +140,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -162,7 +163,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -171,7 +171,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -187,7 +188,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -197,7 +197,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -219,7 +220,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -228,7 +228,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -247,7 +248,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -257,7 +257,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -279,7 +280,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -288,7 +288,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -310,7 +311,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -320,7 +320,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -342,7 +343,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -351,7 +351,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -377,7 +378,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -387,7 +387,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -409,7 +410,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -418,7 +418,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -447,7 +448,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -457,7 +457,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -479,7 +480,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -488,7 +488,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -519,7 +520,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -529,7 +529,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -551,7 +552,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -560,7 +560,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -594,7 +595,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -604,7 +604,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -626,7 +627,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -635,7 +635,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -672,7 +673,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -682,7 +682,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -704,7 +705,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -713,7 +713,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -749,7 +750,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -759,7 +759,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -781,7 +782,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -790,7 +790,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -829,7 +830,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -839,7 +839,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -861,7 +862,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -870,7 +870,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -911,7 +912,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -921,7 +921,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -943,7 +944,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -952,7 +952,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -996,7 +997,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -1006,7 +1006,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1028,7 +1029,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1037,7 +1037,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1096,7 +1097,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1106,7 +1106,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1128,7 +1129,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -1137,7 +1137,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1173,7 +1174,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -1183,7 +1183,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1205,7 +1206,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -1214,7 +1214,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1253,7 +1254,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -1263,7 +1263,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1285,7 +1286,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1294,7 +1294,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1348,7 +1349,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1358,7 +1358,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1380,7 +1381,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1389,7 +1389,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1428,7 +1429,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1438,7 +1438,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1460,7 +1461,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1469,7 +1469,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1493,7 +1494,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1503,7 +1503,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1525,7 +1526,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1534,7 +1534,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1558,7 +1559,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1568,7 +1568,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1590,7 +1591,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1599,7 +1599,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1626,7 +1627,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1636,7 +1636,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1658,7 +1659,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1667,7 +1667,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1696,7 +1697,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1706,7 +1706,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1728,7 +1729,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1737,7 +1737,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1769,7 +1770,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1779,7 +1779,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1801,7 +1802,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1810,7 +1810,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1857,7 +1858,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1867,7 +1867,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1889,7 +1890,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1898,7 +1898,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1922,7 +1923,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1932,7 +1932,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1954,7 +1955,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1963,7 +1963,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1990,7 +1991,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -2000,7 +2000,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2022,7 +2023,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2031,7 +2031,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -2073,7 +2074,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2083,7 +2083,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2105,7 +2106,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2114,7 +2114,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -2141,7 +2142,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2161,7 +2161,8 @@ $result_trees{'ref_error_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2183,7 +2184,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -2192,7 +2192,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -2210,7 +2211,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -2220,7 +2220,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2242,7 +2243,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -2251,7 +2251,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -2267,7 +2268,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -2277,7 +2277,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2299,7 +2300,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2308,7 +2308,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -2334,7 +2335,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2344,7 +2344,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2363,7 +2364,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2372,12 +2372,12 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2397,7 +2397,8 @@ $result_trees{'ref_error_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2419,7 +2420,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -2428,7 +2428,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2471,7 +2472,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -2481,7 +2481,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2503,7 +2504,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39
               }
@@ -2512,7 +2512,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2530,7 +2531,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 39
               }
@@ -2540,7 +2540,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2562,7 +2563,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -2571,7 +2571,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2602,7 +2603,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -2612,7 +2612,8 @@ $result_trees{'ref_error_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2634,7 +2635,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -2643,7 +2643,8 @@ $result_trees{'ref_error_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2671,7 +2672,6 @@ $result_trees{'ref_error_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -2689,25 +2689,25 @@ $result_trees{'ref_error_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_error_formatting'} = '
 @code{@@ref@{node@}} @ref{node}
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 8cbb7f978e..6ffb8a20a0 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -70,7 +70,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => 'for example '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -88,7 +89,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -97,7 +97,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -115,7 +116,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -124,7 +124,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ') ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -173,7 +174,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -391,7 +391,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -445,7 +446,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -519,7 +519,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -537,7 +538,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -583,7 +583,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => 'for example '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -601,7 +602,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -610,7 +610,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -628,7 +629,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -637,7 +637,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ') ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -729,7 +729,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -760,7 +761,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -803,11 +803,13 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -817,7 +819,6 @@ $result_trees{'ref_in_sectioning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -839,7 +840,8 @@ $result_trees{'ref_in_sectioning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -849,7 +851,6 @@ $result_trees{'ref_in_sectioning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -863,7 +864,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -906,11 +906,13 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -920,7 +922,6 @@ $result_trees{'ref_in_sectioning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -955,7 +956,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -998,7 +998,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1040,7 +1041,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1083,7 +1083,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1125,7 +1126,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1168,7 +1168,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1198,7 +1199,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1241,7 +1241,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1265,7 +1266,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -1308,7 +1308,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1351,7 +1352,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -1397,7 +1397,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1444,7 +1445,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -1490,7 +1490,8 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1517,7 +1518,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -1560,7 +1560,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1591,7 +1592,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 39
               }
@@ -1634,7 +1634,8 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -1653,7 +1654,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -1694,24 +1694,24 @@ $result_trees{'ref_in_sectioning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'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_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 2fe0346797..f1f134ea31 100644
--- a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -142,12 +142,12 @@ $result_trees{'reference_for_formatting_customizations'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
@@ -157,12 +157,12 @@ $result_trees{'reference_for_formatting_customizations'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
@@ -178,12 +178,12 @@ $result_trees{'reference_for_formatting_customizations'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
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 a9f9d8eac7..ef87402031 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
@@ -82,7 +82,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -95,7 +96,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'a-in-copying'
@@ -228,7 +228,8 @@ $result_trees{'references_to_top_no_top_output'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -238,7 +239,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'a-in-top'
@@ -263,7 +263,8 @@ $result_trees{'references_to_top_no_top_output'} = {
               'text' => 'Paragraph '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -273,7 +274,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'a-in-paragraph-in-top'
@@ -297,7 +297,8 @@ $result_trees{'references_to_top_no_top_output'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -306,7 +307,8 @@ $result_trees{'references_to_top_no_top_output'} = {
                           'text' => 'in footnote '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -316,7 +318,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'a-in-footnote'
@@ -332,7 +333,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 18
@@ -406,7 +406,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -416,7 +417,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'a-in-float'
@@ -433,7 +433,8 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -442,7 +443,8 @@ $result_trees{'references_to_top_no_top_output'} = {
                           'text' => 'Caption Flist. '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -452,7 +454,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'a-in-caption'
@@ -468,7 +469,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -658,7 +658,8 @@ $result_trees{'references_to_top_no_top_output'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -676,7 +677,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -686,7 +686,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -704,7 +705,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -714,7 +714,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -732,7 +733,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -742,7 +742,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -760,7 +761,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -770,7 +770,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -788,7 +789,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 39
               }
@@ -798,7 +798,8 @@ $result_trees{'references_to_top_no_top_output'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -816,7 +817,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -951,7 +951,8 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -966,7 +967,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1081,12 +1081,12 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$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'}[1]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index fa88be86f3..643424be81 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -68,7 +68,8 @@ $result_trees{'refs_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -90,7 +91,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -99,7 +99,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -125,7 +126,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -135,7 +135,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -157,7 +158,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -166,7 +166,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -195,7 +196,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -205,7 +205,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -227,7 +228,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -236,7 +236,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -267,7 +268,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -277,7 +277,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -299,7 +300,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -308,7 +308,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -342,7 +343,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -352,7 +352,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -374,7 +375,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -383,7 +383,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -420,7 +421,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -430,7 +430,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -452,7 +453,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -461,7 +461,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -497,7 +498,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -507,7 +507,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -529,7 +530,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -538,7 +538,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -577,7 +578,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -587,7 +587,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -609,7 +610,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -618,7 +618,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -659,7 +660,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -669,7 +669,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -700,7 +700,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -744,7 +745,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -754,7 +754,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -776,7 +777,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -785,7 +785,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -844,7 +845,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -854,7 +854,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -876,7 +877,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -885,7 +885,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -921,7 +922,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -931,7 +931,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -953,7 +954,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -962,7 +962,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1001,7 +1002,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -1011,7 +1011,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1033,7 +1034,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -1042,7 +1042,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1096,7 +1097,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -1106,7 +1106,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1128,7 +1129,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1137,7 +1137,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1176,7 +1177,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1196,7 +1196,8 @@ $result_trees{'refs_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1218,7 +1219,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -1227,7 +1227,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1266,7 +1267,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -1276,7 +1276,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1298,7 +1299,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1307,7 +1307,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1349,7 +1350,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1359,7 +1359,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1381,7 +1382,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1390,7 +1390,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1435,7 +1436,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1445,7 +1445,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1467,7 +1468,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1476,7 +1476,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1524,7 +1525,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1534,7 +1534,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1556,7 +1557,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1565,7 +1565,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1615,7 +1616,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1625,7 +1625,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1647,7 +1648,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1656,7 +1656,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1706,7 +1707,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1716,7 +1716,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1738,7 +1739,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1747,7 +1747,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1800,7 +1801,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1810,7 +1810,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1832,7 +1833,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1841,7 +1841,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1896,7 +1897,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1906,7 +1906,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1928,7 +1929,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1937,7 +1937,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1995,7 +1996,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -2005,7 +2005,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2027,7 +2028,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -2036,7 +2036,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2109,7 +2110,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -2119,7 +2119,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2141,7 +2142,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -2150,7 +2150,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2200,7 +2201,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -2210,7 +2210,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2232,7 +2233,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2241,7 +2241,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2294,7 +2295,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2304,7 +2304,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2326,7 +2327,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2335,7 +2335,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2403,7 +2404,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2413,7 +2413,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2435,7 +2436,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -2444,7 +2444,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2497,7 +2498,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -2517,7 +2517,8 @@ $result_trees{'refs_formatting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2539,7 +2540,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -2548,7 +2548,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2591,7 +2592,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -2601,7 +2601,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2623,7 +2624,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2632,7 +2632,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2650,7 +2651,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2660,7 +2660,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2682,7 +2683,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2691,7 +2691,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2722,7 +2723,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2732,7 +2732,8 @@ $result_trees{'refs_formatting'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2754,7 +2755,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -2763,7 +2763,8 @@ $result_trees{'refs_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2791,7 +2792,6 @@ $result_trees{'refs_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -2819,52 +2819,52 @@ $result_trees{'refs_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$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_texis{'refs_formatting'} = '@node chapter
 @chapter chapter
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 7e302faf8c..df37f50c6f 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
@@ -98,14 +98,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => 'A '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'sc '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -115,7 +117,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -124,12 +125,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -138,12 +139,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'TeX',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'TeX',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -152,7 +153,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -161,7 +161,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' node '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -171,7 +172,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -180,11 +180,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -194,7 +196,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -203,7 +204,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -212,11 +212,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -226,7 +228,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -235,7 +236,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -244,12 +244,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -258,11 +258,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -272,7 +274,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -281,7 +282,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -290,12 +290,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -407,14 +407,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'sc '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -424,7 +426,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -433,12 +434,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -447,12 +448,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -461,7 +462,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -470,7 +470,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' node '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -480,7 +481,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -489,11 +489,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -503,7 +505,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -512,7 +513,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -521,11 +521,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -535,7 +537,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -544,7 +545,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -553,12 +553,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -567,11 +567,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -581,7 +583,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -590,7 +591,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -599,12 +599,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -641,7 +641,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -660,7 +660,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' node '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -670,7 +671,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -679,11 +679,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -693,7 +695,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -702,7 +703,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -711,11 +711,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -725,7 +727,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -734,7 +735,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -743,12 +743,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -757,11 +757,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -771,7 +773,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -780,7 +781,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -789,12 +789,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -822,14 +822,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => 'see '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -839,7 +841,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -848,7 +849,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' ref with '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -858,18 +860,17 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 12
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -878,7 +879,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' a i trema '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -888,18 +890,17 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 12
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -908,11 +909,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' a dotless i trema '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -922,7 +925,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -931,7 +933,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -940,11 +941,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -954,7 +957,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -963,7 +965,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -972,12 +973,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' and exclamdown '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -1020,7 +1021,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -1040,21 +1040,24 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'A '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'sc '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1064,7 +1067,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1073,12 +1075,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1087,12 +1089,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'TeX',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'TeX',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1101,7 +1103,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1110,7 +1111,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' node '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1120,7 +1122,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1129,11 +1130,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1143,7 +1146,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1152,7 +1154,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1161,11 +1162,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1175,7 +1178,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1184,7 +1186,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1193,12 +1194,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1207,11 +1208,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1221,7 +1224,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1230,7 +1232,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1239,12 +1240,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1274,7 +1275,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -1316,34 +1316,34 @@ 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'co
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[11];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[12];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'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_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 462a13d48a..6bd5953cc1 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
@@ -107,7 +107,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -118,7 +119,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -303,7 +303,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -314,7 +315,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -354,7 +354,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -364,7 +365,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -389,7 +389,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -411,7 +412,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -431,11 +431,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -446,7 +448,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -466,7 +467,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -486,11 +486,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -500,7 +502,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -517,7 +518,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -546,10 +546,10 @@ 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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'}[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'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'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_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 211aedb3cd..19346fb04e 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -114,7 +114,8 @@ $result_trees{'spaces_in_node_names'} = {
                       'text' => 'b'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -125,7 +126,6 @@ $result_trees{'spaces_in_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -325,7 +325,8 @@ $result_trees{'spaces_in_node_names'} = {
               'text' => 'b'
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -336,7 +337,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -383,7 +383,8 @@ $result_trees{'spaces_in_node_names'} = {
               'text' => 'c'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -418,7 +418,8 @@ $result_trees{'spaces_in_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -444,7 +445,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -464,14 +464,16 @@ $result_trees{'spaces_in_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'b'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -482,7 +484,6 @@ $result_trees{'spaces_in_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -503,7 +504,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -523,14 +523,16 @@ $result_trees{'spaces_in_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'c'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -540,7 +542,6 @@ $result_trees{'spaces_in_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -558,7 +559,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -594,13 +594,13 @@ 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$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'}[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'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'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_texis{'spaces_in_node_names'} = '@node Top
 
diff --git a/tp/t/results/converters_tests/test_formatting_customizations.pl 
b/tp/t/results/converters_tests/test_formatting_customizations.pl
index e797cb8c6b..51f1d45711 100644
--- a/tp/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/test_formatting_customizations.pl
@@ -142,12 +142,12 @@ $result_trees{'test_formatting_customizations'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
@@ -157,12 +157,12 @@ $result_trees{'test_formatting_customizations'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
@@ -178,12 +178,12 @@ $result_trees{'test_formatting_customizations'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'formatting_customizations_input.texi',
                 'line_nr' => 7
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 799e6e1ddd..a40d13b5ac 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -27,7 +27,8 @@ $result_trees{'things_before_setfilename'} = {
               'type' => 'preamble_before_beginning'
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -37,7 +38,6 @@ $result_trees{'things_before_setfilename'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'An-anchor'
@@ -64,7 +64,8 @@ $result_trees{'things_before_setfilename'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -82,7 +83,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 6
@@ -107,7 +107,8 @@ $result_trees{'things_before_setfilename'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -125,7 +126,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 9
@@ -146,7 +146,8 @@ $result_trees{'things_before_setfilename'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -164,7 +165,8 @@ $result_trees{'things_before_setfilename'} = {
                           'type' => 'empty_line'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -174,7 +176,6 @@ $result_trees{'things_before_setfilename'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -201,7 +202,8 @@ $result_trees{'things_before_setfilename'} = {
 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -219,7 +221,6 @@ $result_trees{'things_before_setfilename'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => 
'things_before_setfilename.texi',
                                 'line_nr' => 16
@@ -236,7 +237,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
@@ -348,7 +348,8 @@ $result_trees{'things_before_setfilename'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -366,7 +367,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 24
@@ -429,7 +429,8 @@ $result_trees{'things_before_setfilename'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -444,7 +445,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
@@ -927,7 +927,8 @@ $result_trees{'things_before_setfilename'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -945,7 +946,6 @@ $result_trees{'things_before_setfilename'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 53
@@ -970,7 +970,8 @@ $result_trees{'things_before_setfilename'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -988,7 +989,6 @@ $result_trees{'things_before_setfilename'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 56
@@ -1023,15 +1023,15 @@ $result_trees{'things_before_setfilename'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'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_texis{'things_before_setfilename'} = '\\input texinfo
 
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 3df1163f55..0aef3f6b90 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -27,7 +27,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'type' => 'preamble_before_beginning'
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -37,7 +38,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'An-anchor'
@@ -64,7 +64,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -82,7 +83,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 6
@@ -107,7 +107,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -125,7 +126,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 9
@@ -146,7 +146,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -164,7 +165,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           'type' => 'empty_line'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -174,7 +176,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -201,7 +202,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -219,7 +221,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'file_name' => 
'things_before_setfilename_no_element.texi',
                                 'line_nr' => 16
@@ -236,7 +237,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
@@ -348,7 +348,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -366,7 +367,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 24
@@ -429,7 +429,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -444,7 +445,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
@@ -800,7 +800,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -818,7 +819,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 47
@@ -843,7 +843,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -861,7 +862,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 50
@@ -885,15 +885,15 @@ $result_trees{'things_before_setfilename_no_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'things_before_setfilename_no_element'} = '\\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 4464430d4f..7c21d75842 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -75,7 +75,8 @@ $result_trees{'top_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -97,7 +98,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -106,7 +106,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -142,7 +142,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -173,7 +173,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -202,7 +203,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -212,7 +212,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -234,7 +235,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -243,7 +243,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -274,7 +275,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -284,7 +284,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -306,7 +307,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -315,7 +315,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -349,7 +350,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -359,7 +359,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -381,7 +382,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -390,7 +390,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -427,7 +428,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -437,7 +437,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -459,7 +460,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -468,7 +468,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -504,7 +505,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -514,7 +514,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -536,7 +537,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -545,7 +545,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -584,7 +585,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -594,7 +594,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -616,7 +617,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -625,7 +625,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -666,7 +667,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -676,7 +676,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -698,7 +699,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -707,7 +707,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -751,7 +752,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -761,7 +761,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -783,7 +784,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -792,7 +792,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -851,7 +852,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -861,7 +861,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -883,7 +884,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -892,7 +892,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -928,7 +929,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -938,7 +938,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -960,7 +961,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -969,7 +969,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1008,7 +1009,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -1018,7 +1018,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1040,7 +1041,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1049,7 +1049,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1103,7 +1104,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -1113,7 +1113,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1135,7 +1136,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -1144,7 +1144,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1183,7 +1184,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -1203,7 +1203,8 @@ $result_trees{'top_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1225,7 +1226,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1234,7 +1234,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1273,7 +1274,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1283,7 +1283,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1305,7 +1306,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1314,7 +1314,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1356,7 +1357,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1366,7 +1366,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1388,7 +1389,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1397,7 +1397,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1442,7 +1443,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1452,7 +1452,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1474,7 +1475,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1483,7 +1483,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1531,7 +1532,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1541,7 +1541,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1563,7 +1564,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1572,7 +1572,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1622,7 +1623,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -1632,7 +1632,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1654,7 +1655,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1663,7 +1663,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1713,7 +1714,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -1723,7 +1723,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1745,7 +1746,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1754,7 +1754,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1807,7 +1808,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -1817,7 +1817,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1839,7 +1840,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1848,7 +1848,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1903,7 +1904,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1913,7 +1913,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1935,7 +1936,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1944,7 +1944,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2002,7 +2003,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -2012,7 +2012,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2034,7 +2035,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -2043,7 +2043,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2116,7 +2117,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -2126,7 +2126,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2148,7 +2149,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2157,7 +2157,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2207,7 +2208,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -2217,7 +2217,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2239,7 +2240,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2248,7 +2248,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2301,7 +2302,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -2311,7 +2311,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2333,7 +2334,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -2342,7 +2342,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2410,7 +2411,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -2420,7 +2420,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2442,7 +2443,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -2451,7 +2451,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2504,7 +2505,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -2524,7 +2524,8 @@ $result_trees{'top_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2546,7 +2547,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2555,7 +2555,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2598,7 +2599,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -2608,7 +2608,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2630,7 +2631,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2639,7 +2639,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2657,7 +2658,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -2667,7 +2667,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2689,7 +2690,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -2698,7 +2698,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2729,7 +2730,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -2739,7 +2739,8 @@ $result_trees{'top_in_ref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2761,7 +2762,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -2770,7 +2770,8 @@ $result_trees{'top_in_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2798,7 +2799,6 @@ $result_trees{'top_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -2827,52 +2827,52 @@ $result_trees{'top_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$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_texis{'top_in_ref'} = '@node Top
 
diff --git a/tp/t/results/converters_tests/unknown_value.pl 
b/tp/t/results/converters_tests/unknown_value.pl
index 4139e57e56..b13e98c74f 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -10,7 +10,8 @@ $result_trees{'unknown_value'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -19,8 +20,7 @@ $result_trees{'unknown_value'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         }
       ],
       'type' => 'before_node_section'
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 d3eb48d8f7..ccc15ab534 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
@@ -637,7 +637,8 @@ $result_trees{'various_itemize_command_as_argument'} = {
                       'text' => 'a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -647,7 +648,6 @@ $result_trees{'various_itemize_command_as_argument'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 31
                       }
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 c048a596ad..e9fb68b4e4 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
@@ -855,7 +855,8 @@ $result_trees{'various_vtable_command_as_argument'} = {
                               'text' => 'a'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'sup',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -865,7 +866,6 @@ $result_trees{'various_vtable_command_as_argument'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'sup',
                               'source_info' => {
                                 'line_nr' => 30
                               }
diff --git a/tp/t/results/coverage/accent_and_dash.pl 
b/tp/t/results/coverage/accent_and_dash.pl
index dbd8a84224..315eb99a90 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_and_dash'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'accent_and_dash'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/accent_no_closed.pl 
b/tp/t/results/coverage/accent_no_closed.pl
index 8ab69db67d..37766ab31e 100644
--- a/tp/t/results/coverage/accent_no_closed.pl
+++ b/tp/t/results/coverage/accent_no_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'accent_no_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/accent_no_closed_comment.pl 
b/tp/t/results/coverage/accent_no_closed_comment.pl
index b892e68d4b..e2888caa2d 100644
--- a/tp/t/results/coverage/accent_no_closed_comment.pl
+++ b/tp/t/results/coverage/accent_no_closed_comment.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_comment'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'accent_no_closed_comment'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/accent_no_closed_newline.pl 
b/tp/t/results/coverage/accent_no_closed_newline.pl
index 9eee8fb192..c204dc032c 100644
--- a/tp/t/results/coverage/accent_no_closed_newline.pl
+++ b/tp/t/results/coverage/accent_no_closed_newline.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_newline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'accent_no_closed_newline'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/accent_no_closed_paragraph.pl 
b/tp/t/results/coverage/accent_no_closed_paragraph.pl
index 7da734377b..f38298a69a 100644
--- a/tp/t/results/coverage/accent_no_closed_paragraph.pl
+++ b/tp/t/results/coverage/accent_no_closed_paragraph.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_paragraph'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'accent_no_closed_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/accents_errors.pl 
b/tp/t/results/coverage/accents_errors.pl
index dabd78f7ff..67dc2dad7d 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -15,7 +15,8 @@ $result_trees{'accents_errors'} = {
               'text' => 'accent at end of line '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'accents_errors'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -40,7 +40,8 @@ $result_trees{'accents_errors'} = {
               'text' => 'ccent at end of line and spaces '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'accents_errors'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '  
@@ -97,7 +97,8 @@ $result_trees{'accents_errors'} = {
               'text' => 'accent character with spaces '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'accents_errors'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -125,7 +125,8 @@ $result_trees{'accents_errors'} = {
               'text' => 'accent character at end of line '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -135,7 +136,6 @@ $result_trees{'accents_errors'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
diff --git a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl 
b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
index 9582da6101..87e43e7fc2 100644
--- a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
+++ b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
@@ -12,7 +12,8 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index e08562dcf2..72bbbdaebc 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -200,7 +200,8 @@ $result_trees{'block_commands'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -229,7 +230,6 @@ $result_trees{'block_commands'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 98edd7a107..2278bdbf85 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -77,7 +77,8 @@ $result_trees{'cartouche'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -87,7 +88,6 @@ $result_trees{'cartouche'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 5
                   }
diff --git a/tp/t/results/coverage/cartouche_title_and_content.pl 
b/tp/t/results/coverage/cartouche_title_and_content.pl
index 497d042a6b..e456962101 100644
--- a/tp/t/results/coverage/cartouche_title_and_content.pl
+++ b/tp/t/results/coverage/cartouche_title_and_content.pl
@@ -17,7 +17,8 @@ $result_trees{'cartouche_title_and_content'} = {
                   'text' => 'Box title on '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'cartouche_title_and_content'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index ab4d0c94c6..ce197a18db 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -22,7 +22,8 @@ $result_trees{'center'} = {
                   'text' => 'in center '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -32,7 +33,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/coverage/command_in_end.pl 
b/tp/t/results/coverage/command_in_end.pl
index fa7b4abd79..7c86eab887 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -34,7 +34,8 @@ $result_trees{'command_in_end'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -44,7 +45,6 @@ $result_trees{'command_in_end'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 3
                           }
@@ -105,7 +105,8 @@ $result_trees{'command_in_end'} = {
                               'text' => 'q'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -115,7 +116,6 @@ $result_trees{'command_in_end'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 7
                               }
@@ -179,7 +179,8 @@ $result_trees{'command_in_end'} = {
                                   'text' => 'qu'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'code',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -189,7 +190,6 @@ $result_trees{'command_in_end'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'code',
                                   'source_info' => {
                                     'line_nr' => 11
                                   }
@@ -253,7 +253,8 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'quot'
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'asis',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -263,7 +264,6 @@ $result_trees{'command_in_end'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'asis',
                                       'source_info' => {
                                         'line_nr' => 15
                                       }
@@ -333,12 +333,12 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'q'
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'asis',
+                                      'contents' => [
                                         {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'asis',
                                       'source_info' => {
                                         'line_nr' => 19
                                       }
@@ -410,12 +410,12 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'qu'
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'asis',
+                                      'contents' => [
                                         {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'asis',
                                       'source_info' => {
                                         'line_nr' => 23
                                       }
@@ -487,12 +487,12 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'quot'
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'asis',
+                                      'contents' => [
                                         {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'asis',
                                       'source_info' => {
                                         'line_nr' => 27
                                       }
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
index 7a103213b9..dfcafcdcc7 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
@@ -40,7 +40,8 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
                       'text' => 'tex'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -50,7 +51,6 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
index eca45ce029..1bbf6446f7 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
@@ -40,12 +40,12 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
                       'text' => 'tex'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
index 1f942121f0..0eba3eecbb 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
@@ -34,7 +34,8 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -44,7 +45,6 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 3
                           }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
index c20c6ee486..2d9349ad12 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
@@ -40,12 +40,12 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
                       'text' => 't'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
index b7cdb607d2..23a6ab9399 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
@@ -37,7 +37,8 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                           'text' => 't'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'asis',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -47,7 +48,6 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'asis',
                           'source_info' => {
                             'line_nr' => 3
                           }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
index da48ec631e..4bdd3b8683 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
@@ -40,12 +40,12 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
                       'text' => 'te'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
index 6241f4829a..7d8e18c853 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
@@ -37,7 +37,8 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                           'text' => 'te'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'asis',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -47,7 +48,6 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'asis',
                           'source_info' => {
                             'line_nr' => 3
                           }
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 2ce7ca0c4c..a889623f7c 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -41,7 +41,8 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
                       'text' => 'html'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -51,7 +52,6 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 3481e7848f..e7a13f266f 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -18,12 +18,12 @@ $result_trees{'commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -36,7 +36,8 @@ $result_trees{'commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -46,7 +47,6 @@ $result_trees{'commands'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -55,11 +55,13 @@ $result_trees{'commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -69,7 +71,6 @@ $result_trees{'commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -78,7 +79,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,7 +87,8 @@ $result_trees{'commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -97,7 +98,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -106,7 +106,8 @@ $result_trees{'commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -116,7 +117,6 @@ $result_trees{'commands'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -141,19 +141,20 @@ $result_trees{'commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'clicksequence',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'File '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'arrow'
                       },
@@ -168,7 +169,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'clicksequence',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -181,7 +181,8 @@ $result_trees{'commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -204,7 +205,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -213,7 +213,8 @@ $result_trees{'commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -223,7 +224,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -236,7 +236,8 @@ $result_trees{'commands'} = {
               'text' => '--- -- \'\' ``. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -246,7 +247,6 @@ $result_trees{'commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -271,12 +271,12 @@ $result_trees{'commands'} = {
                   'text' => 'index entry ``in text\'\' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'LaTeX',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -322,7 +322,8 @@ $result_trees{'commands'} = {
                   'text' => 'majorheading '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'b',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -332,7 +333,6 @@ $result_trees{'commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'b',
                   'source_info' => {
                     'line_nr' => 10
                   }
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 47bb945dab..f858b96ecf 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -29,7 +29,8 @@ $result_trees{'commands_in_math'} = {
           'cmdname' => 'displaymath',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -39,7 +40,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -48,7 +48,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -58,7 +59,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -71,12 +71,12 @@ $result_trees{'commands_in_math'} = {
               'text' => '`'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -85,12 +85,12 @@ $result_trees{'commands_in_math'} = {
               'text' => '`simple-double-'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -99,12 +99,12 @@ $result_trees{'commands_in_math'} = {
               'text' => '-three---four----\''
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -174,7 +174,8 @@ $result_trees{'commands_in_math'} = {
           'cmdname' => 'displaymath',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -193,7 +193,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -203,7 +204,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -212,7 +212,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -222,7 +223,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -231,7 +231,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -250,7 +250,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -269,7 +269,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -279,7 +280,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -288,7 +288,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -298,7 +299,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -307,7 +307,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -317,7 +318,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -326,7 +326,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -336,7 +337,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -345,7 +345,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -355,7 +356,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -364,11 +364,13 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -378,7 +380,6 @@ $result_trees{'commands_in_math'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -387,7 +388,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -397,12 +397,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -411,11 +411,13 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -425,7 +427,6 @@ $result_trees{'commands_in_math'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -434,7 +435,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -443,11 +443,13 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -457,7 +459,6 @@ $result_trees{'commands_in_math'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -466,7 +467,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -475,7 +475,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -485,7 +486,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -494,7 +494,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -504,7 +505,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -513,7 +513,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -523,7 +524,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -532,7 +532,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -542,7 +543,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -551,7 +551,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -571,7 +571,8 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -581,7 +582,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -590,7 +590,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -609,7 +609,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -619,7 +620,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -628,7 +628,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -638,7 +639,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -647,7 +647,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -657,7 +658,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -666,7 +666,8 @@ $result_trees{'commands_in_math'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -676,13 +677,13 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 10
               }
             },
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -692,7 +693,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -782,12 +782,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -851,12 +851,12 @@ $result_trees{'commands_in_math'} = {
           'cmdname' => 'displaymath',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'arrow'
               },
@@ -869,7 +869,8 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -879,7 +880,6 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -889,12 +889,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -903,12 +903,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -917,12 +917,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -931,12 +931,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -945,12 +945,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -959,12 +959,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -973,12 +973,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -988,12 +988,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1002,12 +1002,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1016,12 +1016,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1030,12 +1030,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1044,12 +1044,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1058,12 +1058,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -1073,12 +1073,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1087,12 +1087,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1101,12 +1101,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1115,12 +1115,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1129,12 +1129,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1143,12 +1143,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1157,12 +1157,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1171,12 +1171,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1185,12 +1185,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1199,12 +1199,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1213,12 +1213,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1227,12 +1227,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -1242,12 +1242,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1256,12 +1256,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1270,12 +1270,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1284,12 +1284,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1298,12 +1298,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1312,12 +1312,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -1327,12 +1327,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1341,12 +1341,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1355,12 +1355,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1369,12 +1369,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -1438,12 +1438,12 @@ $result_trees{'commands_in_math'} = {
           'cmdname' => 'displaymath',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1452,12 +1452,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1467,12 +1467,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1481,12 +1481,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1495,12 +1495,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1509,12 +1509,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1523,12 +1523,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -1538,12 +1538,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1552,12 +1552,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1566,12 +1566,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1580,12 +1580,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -1595,12 +1595,12 @@ $result_trees{'commands_in_math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1609,12 +1609,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1623,12 +1623,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1637,12 +1637,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1651,12 +1651,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'leq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1665,12 +1665,12 @@ $result_trees{'commands_in_math'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 30
               }
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 8f4de46a68..982ca1ee90 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -88,7 +88,8 @@ $result_trees{'comment_on_cartouche_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -98,7 +99,6 @@ $result_trees{'comment_on_cartouche_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 5
                   }
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index f867f944ef..426fa4fd85 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -453,7 +453,8 @@ $result_trees{'def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -463,7 +464,6 @@ $result_trees{'def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -525,7 +525,8 @@ $result_trees{'def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -534,8 +535,7 @@ $result_trees{'def'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -972,7 +972,8 @@ $result_trees{'def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -982,7 +983,6 @@ $result_trees{'def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1028,7 +1028,8 @@ $result_trees{'def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1037,8 +1038,7 @@ $result_trees{'def'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'b'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -1087,14 +1087,16 @@ $result_trees{'def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
                                       'text' => 'id '
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'samp',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1104,7 +1106,6 @@ $result_trees{'def'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'samp',
                                       'source_info' => {
                                         'line_nr' => 17
                                       }
@@ -1116,7 +1117,6 @@ $result_trees{'def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -1162,14 +1162,16 @@ $result_trees{'def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'id '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'samp',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1178,8 +1180,7 @@ $result_trees{'def'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'samp'
+                                  ]
                                 },
                                 {
                                   'text' => ' ule'
@@ -1187,8 +1188,7 @@ $result_trees{'def'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'b'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index 4f1da4f5dc..bbed36c9b7 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -134,7 +134,8 @@ $result_trees{'displaymath'} = {
           'cmdname' => 'displaymath',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,6 @@ $result_trees{'displaymath'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -153,7 +153,8 @@ $result_trees{'displaymath'} = {
               'text' => ' a < b \\sum'
             },
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -163,7 +164,6 @@ $result_trees{'displaymath'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -172,7 +172,8 @@ $result_trees{'displaymath'} = {
               'text' => ' q'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -182,7 +183,6 @@ $result_trees{'displaymath'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -263,7 +263,8 @@ $result_trees{'displaymath'} = {
                   'text' => '{'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -284,7 +285,6 @@ $result_trees{'displaymath'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 13
                   }
diff --git a/tp/t/results/coverage/empty_w.pl b/tp/t/results/coverage/empty_w.pl
index fecda21dce..980cc65ba0 100644
--- a/tp/t/results/coverage/empty_w.pl
+++ b/tp/t/results/coverage/empty_w.pl
@@ -12,12 +12,12 @@ $result_trees{'empty_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -26,7 +26,8 @@ $result_trees{'empty_w'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,7 +37,6 @@ $result_trees{'empty_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl 
b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
index 678a7b2d34..b1a7db049a 100644
--- a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
+++ b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
@@ -37,7 +37,8 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                           'text' => ': '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -47,7 +48,6 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 3
                           }
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index 9d8b9eb688..4943cc7c4a 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -29,12 +29,12 @@ $result_trees{'exdent_and_formats'} = {
                   'text' => ' Example   Hoho. '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TeX',
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index 077150704d..428f2a84b7 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -15,7 +15,8 @@ $result_trees{'hyphenation'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'hyphenation',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -30,7 +31,6 @@ $result_trees{'hyphenation'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'hyphenation',
           'extra' => {},
           'source_info' => {
             'line_nr' => 2
diff --git a/tp/t/results/coverage/indicateurl_end_lines.pl 
b/tp/t/results/coverage/indicateurl_end_lines.pl
index b33a2877db..1086cf2b02 100644
--- a/tp/t/results/coverage/indicateurl_end_lines.pl
+++ b/tp/t/results/coverage/indicateurl_end_lines.pl
@@ -12,7 +12,8 @@ $result_trees{'indicateurl_end_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -26,7 +27,6 @@ $result_trees{'indicateurl_end_lines'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -46,7 +46,8 @@ $result_trees{'indicateurl_end_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -62,7 +63,6 @@ $result_trees{'indicateurl_end_lines'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/coverage/invalid_U.pl 
b/tp/t/results/coverage/invalid_U.pl
index 6870db5fec..47ed9ae7e3 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -23,12 +23,12 @@ $result_trees{'invalid_U'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -37,7 +37,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -47,7 +48,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -56,7 +56,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -66,7 +67,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -75,7 +75,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -85,7 +86,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -94,7 +94,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -104,7 +105,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -113,7 +113,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -123,7 +124,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -133,7 +133,8 @@ $result_trees{'invalid_U'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -151,7 +152,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -160,7 +160,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -170,7 +171,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -179,7 +179,8 @@ $result_trees{'invalid_U'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -197,7 +198,6 @@ $result_trees{'invalid_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl 
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 992e508fb9..7484cef33a 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -12,7 +12,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '    '
@@ -47,7 +47,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -83,7 +83,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -93,7 +94,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -119,7 +119,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -129,7 +130,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -155,7 +155,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -165,7 +166,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -190,7 +190,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -200,7 +201,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -226,7 +226,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -236,7 +237,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -262,7 +262,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -273,7 +274,6 @@ $result_trees{'lettered_accent_and_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage/math.pl b/tp/t/results/coverage/math.pl
index a4b2a32963..deb7430f44 100644
--- a/tp/t/results/coverage/math.pl
+++ b/tp/t/results/coverage/math.pl
@@ -16,7 +16,8 @@ $result_trees{'math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -51,7 +52,6 @@ $result_trees{'math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -81,11 +81,13 @@ $result_trees{'math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -95,7 +97,6 @@ $result_trees{'math'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -104,7 +105,8 @@ $result_trees{'math'} = {
                       'text' => ' a < b \\sum'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -114,7 +116,6 @@ $result_trees{'math'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -123,7 +124,8 @@ $result_trees{'math'} = {
                       'text' => ' q'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -133,7 +135,6 @@ $result_trees{'math'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -142,7 +143,6 @@ $result_trees{'math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -166,7 +166,8 @@ $result_trees{'math'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -178,7 +179,8 @@ $result_trees{'math'} = {
                           'text' => '{'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -199,7 +201,6 @@ $result_trees{'math'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 8
                           }
@@ -262,7 +263,6 @@ $result_trees{'math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -314,7 +314,8 @@ $result_trees{'math'} = {
               'text' => 'The 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -324,7 +325,6 @@ $result_trees{'math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -333,7 +333,8 @@ $result_trees{'math'} = {
               'text' => 'is the I'
             },
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -343,7 +344,6 @@ $result_trees{'math'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 13
               }
diff --git a/tp/t/results/coverage/not_i_j_in_dotless.pl 
b/tp/t/results/coverage/not_i_j_in_dotless.pl
index 28f8a1e992..ed314ceefa 100644
--- a/tp/t/results/coverage/not_i_j_in_dotless.pl
+++ b/tp/t/results/coverage/not_i_j_in_dotless.pl
@@ -12,7 +12,8 @@ $result_trees{'not_i_j_in_dotless'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'not_i_j_in_dotless'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotless',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -36,11 +36,13 @@ $result_trees{'not_i_j_in_dotless'} = {
               'text' => ' bc, '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -50,7 +52,6 @@ $result_trees{'not_i_j_in_dotless'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -59,7 +60,6 @@ $result_trees{'not_i_j_in_dotless'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index e768119789..ffce2ee6e3 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -320,7 +320,8 @@ $result_trees{'punctuation_in_line_commands'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -335,7 +336,6 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -440,7 +440,8 @@ $result_trees{'punctuation_in_line_commands'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -455,7 +456,6 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -630,7 +630,8 @@ $result_trees{'punctuation_in_line_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -640,7 +641,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 30
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index be63cfbdd3..19b68b2c82 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -72,7 +72,8 @@ $result_trees{'quotation_author'} = {
                           'text' => 'S'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '~',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -82,7 +83,6 @@ $result_trees{'quotation_author'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '~',
                           'source_info' => {
                             'line_nr' => 5
                           }
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl 
b/tp/t/results/coverage/spaces_after_braced_command.pl
index 2d29f61c59..1fe566e3d0 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -12,7 +12,8 @@ $result_trees{'spaces_after_braced_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'spaces_after_braced_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -47,7 +47,8 @@ $result_trees{'spaces_after_braced_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'spaces_after_braced_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -83,12 +83,12 @@ $result_trees{'spaces_after_braced_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
@@ -114,7 +114,8 @@ $result_trees{'spaces_after_braced_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -141,7 +142,6 @@ $result_trees{'spaces_after_braced_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => '
diff --git a/tp/t/results/coverage/test_errormsg.pl 
b/tp/t/results/coverage/test_errormsg.pl
index 8dfc9dc643..3ec6f50129 100644
--- a/tp/t/results/coverage/test_errormsg.pl
+++ b/tp/t/results/coverage/test_errormsg.pl
@@ -16,14 +16,16 @@ $result_trees{'test_errormsg'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'errormsg',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'Text '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -33,7 +35,6 @@ $result_trees{'test_errormsg'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -42,7 +43,8 @@ $result_trees{'test_errormsg'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -52,7 +54,6 @@ $result_trees{'test_errormsg'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -61,7 +62,6 @@ $result_trees{'test_errormsg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'errormsg',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -71,7 +71,8 @@ $result_trees{'test_errormsg'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'errormsg',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -89,7 +90,6 @@ $result_trees{'test_errormsg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'errormsg',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage/test_tie.pl 
b/tp/t/results/coverage/test_tie.pl
index 39f18015ca..f3c09e1ef8 100644
--- a/tp/t/results/coverage/test_tie.pl
+++ b/tp/t/results/coverage/test_tie.pl
@@ -15,12 +15,12 @@ $result_trees{'test_tie'} = {
               'text' => 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/test_today.pl 
b/tp/t/results/coverage/test_today.pl
index d20583bf26..434af3736a 100644
--- a/tp/t/results/coverage/test_today.pl
+++ b/tp/t/results/coverage/test_today.pl
@@ -12,12 +12,12 @@ $result_trees{'test_today'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage/titlefont_in_center.pl 
b/tp/t/results/coverage/titlefont_in_center.pl
index b2e13a0d41..63b640468d 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -19,7 +19,8 @@ $result_trees{'titlefont_in_center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -29,7 +30,6 @@ $result_trees{'titlefont_in_center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
diff --git a/tp/t/results/coverage/unknown_accents.pl 
b/tp/t/results/coverage/unknown_accents.pl
index 03bf6e0a76..3ae3ca60bd 100644
--- a/tp/t/results/coverage/unknown_accents.pl
+++ b/tp/t/results/coverage/unknown_accents.pl
@@ -12,7 +12,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -50,7 +50,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -60,7 +61,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -69,7 +69,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -99,7 +99,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -109,7 +110,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -118,7 +118,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -128,7 +129,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -137,7 +137,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -147,7 +148,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -157,7 +157,8 @@ $result_trees{'unknown_accents'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -167,7 +168,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -176,7 +176,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -186,7 +187,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -195,7 +195,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -205,7 +206,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -225,7 +225,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -235,7 +236,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -244,7 +244,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -254,7 +255,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -274,7 +274,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -284,7 +285,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -293,7 +293,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -303,7 +304,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -312,7 +312,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -322,7 +323,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -331,7 +331,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -341,7 +342,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -351,7 +351,8 @@ $result_trees{'unknown_accents'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -361,7 +362,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -370,7 +370,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -380,7 +381,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -389,7 +389,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -399,7 +400,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -408,7 +408,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -418,7 +419,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -438,7 +438,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -448,7 +449,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -457,7 +457,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -467,7 +468,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -476,7 +476,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -486,7 +487,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -506,7 +506,8 @@ $result_trees{'unknown_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -516,7 +517,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -525,7 +525,8 @@ $result_trees{'unknown_accents'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -535,7 +536,6 @@ $result_trees{'unknown_accents'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 13
               }
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl 
b/tp/t/results/coverage_braces/abbr_acronym.pl
index 0052951dec..c27a1bf97c 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -12,7 +12,8 @@ $result_trees{'abbr_acronym'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -40,7 +40,8 @@ $result_trees{'abbr_acronym'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -60,7 +60,8 @@ $result_trees{'abbr_acronym'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -75,12 +76,12 @@ $result_trees{'abbr_acronym'} = {
                       'text' => 'an accronym '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -89,12 +90,12 @@ $result_trees{'abbr_acronym'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -103,7 +104,6 @@ $result_trees{'abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -123,11 +123,13 @@ $result_trees{'abbr_acronym'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -137,7 +139,6 @@ $result_trees{'abbr_acronym'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -146,12 +147,12 @@ $result_trees{'abbr_acronym'} = {
                       'text' => '--a. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -165,7 +166,8 @@ $result_trees{'abbr_acronym'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -175,7 +177,6 @@ $result_trees{'abbr_acronym'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -184,12 +185,12 @@ $result_trees{'abbr_acronym'} = {
                       'text' => 'tude--'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -198,7 +199,8 @@ $result_trees{'abbr_acronym'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -208,7 +210,6 @@ $result_trees{'abbr_acronym'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -225,7 +226,6 @@ $result_trees{'abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -235,11 +235,13 @@ $result_trees{'abbr_acronym'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -249,7 +251,6 @@ $result_trees{'abbr_acronym'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -258,12 +259,12 @@ $result_trees{'abbr_acronym'} = {
                       'text' => '--a. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -275,7 +276,6 @@ $result_trees{'abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 6
               }
diff --git a/tp/t/results/coverage_braces/anchor_not_closed.pl 
b/tp/t/results/coverage_braces/anchor_not_closed.pl
index 8a02846795..7ced72964e 100644
--- a/tp/t/results/coverage_braces/anchor_not_closed.pl
+++ b/tp/t/results/coverage_braces/anchor_not_closed.pl
@@ -10,7 +10,8 @@ $result_trees{'anchor_not_closed'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -26,7 +27,6 @@ $result_trees{'anchor_not_closed'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/coverage_braces/brace_opened_no_command.pl 
b/tp/t/results/coverage_braces/brace_opened_no_command.pl
index 3d8f5c245d..04cbc94cd0 100644
--- a/tp/t/results/coverage_braces/brace_opened_no_command.pl
+++ b/tp/t/results/coverage_braces/brace_opened_no_command.pl
@@ -21,7 +21,8 @@ $result_trees{'brace_opened_no_command'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -31,7 +32,6 @@ $result_trees{'brace_opened_no_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'truc'
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 2b90aa97ef..a9a184476c 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -34,7 +34,8 @@ $result_trees{'caption_not_closed'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -85,7 +86,6 @@ $result_trees{'caption_not_closed'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/coverage_braces/code_not_closed.pl 
b/tp/t/results/coverage_braces/code_not_closed.pl
index 0cd2877b38..50714a5805 100644
--- a/tp/t/results/coverage_braces/code_not_closed.pl
+++ b/tp/t/results/coverage_braces/code_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'code_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'code_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/command_in_U.pl 
b/tp/t/results/coverage_braces/command_in_U.pl
index 35a230c7b6..1662188cb7 100644
--- a/tp/t/results/coverage_braces/command_in_U.pl
+++ b/tp/t/results/coverage_braces/command_in_U.pl
@@ -12,11 +12,13 @@ $result_trees{'command_in_U'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -26,7 +28,6 @@ $result_trees{'command_in_U'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -35,7 +36,6 @@ $result_trees{'command_in_U'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/command_in_dotless.pl 
b/tp/t/results/coverage_braces/command_in_dotless.pl
index b2ce704c36..24a6527cd4 100644
--- a/tp/t/results/coverage_braces/command_in_dotless.pl
+++ b/tp/t/results/coverage_braces/command_in_dotless.pl
@@ -12,11 +12,13 @@ $result_trees{'command_in_dotless'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -26,7 +28,6 @@ $result_trees{'command_in_dotless'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -35,7 +36,6 @@ $result_trees{'command_in_dotless'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 1
               }
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 f02c4ac953..8109db2a52 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -138,11 +138,13 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'Text '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -152,7 +154,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -164,7 +165,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -174,11 +174,13 @@ $result_trees{'contain_plain_text_nestings'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'hyphenation',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -188,7 +190,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -200,7 +201,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'hyphenation',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 8
@@ -212,11 +212,13 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'key',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -226,7 +228,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -238,7 +239,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'key',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -259,11 +259,13 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'type' => 'spaces_at_end'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -273,7 +275,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 10
                               }
@@ -285,7 +286,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -344,11 +344,13 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'Text '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -379,7 +381,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -391,7 +392,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -401,11 +401,13 @@ $result_trees{'contain_plain_text_nestings'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'hyphenation',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -436,7 +438,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -448,7 +449,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'hyphenation',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 14
@@ -460,11 +460,13 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'key',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -495,7 +497,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -507,7 +508,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'key',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -528,11 +528,13 @@ $result_trees{'contain_plain_text_nestings'} = {
                       'type' => 'spaces_at_end'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -563,7 +565,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -575,7 +576,6 @@ $result_trees{'contain_plain_text_nestings'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -667,10 +667,10 @@ $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]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'contain_plain_text_nestings'} = '@node Top
diff --git a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl 
b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
index 98d07a6f61..a00c731c14 100644
--- a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
+++ b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
@@ -153,7 +153,8 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '*'
               },
@@ -187,12 +187,12 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -201,7 +201,8 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -211,7 +212,6 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'extra' => {
                 'begin' => '(',
                 'end' => ')'
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl 
b/tp/t/results/coverage_braces/email_possibilities.pl
index a64f1e361b..7e8c6d1bbd 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -12,7 +12,8 @@ $result_trees{'email_possibilities'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'email_possibilities'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -40,7 +40,8 @@ $result_trees{'email_possibilities'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -53,7 +54,6 @@ $result_trees{'email_possibilities'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -63,7 +63,8 @@ $result_trees{'email_possibilities'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -73,7 +74,6 @@ $result_trees{'email_possibilities'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index 8106a29b67..08717fb1b4 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -10,12 +10,12 @@ $result_trees{'empty_commands'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 1
@@ -33,12 +33,12 @@ $result_trees{'empty_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -47,12 +47,12 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -61,12 +61,12 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -75,23 +75,23 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 3
@@ -101,12 +101,12 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -115,12 +115,12 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -129,12 +129,12 @@ $result_trees{'empty_commands'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
diff --git a/tp/t/results/coverage_braces/empty_images.pl 
b/tp/t/results/coverage_braces/empty_images.pl
index fbf430039e..2f80e067a2 100644
--- a/tp/t/results/coverage_braces/empty_images.pl
+++ b/tp/t/results/coverage_braces/empty_images.pl
@@ -10,12 +10,12 @@ $result_trees{'empty_images'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -33,7 +33,8 @@ $result_trees{'empty_images'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'info' => {
                 'spaces_before_argument' => {
@@ -80,7 +81,6 @@ $result_trees{'empty_images'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -98,7 +98,8 @@ $result_trees{'empty_images'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'type' => 'brace_arg'
             },
@@ -117,7 +118,6 @@ $result_trees{'empty_images'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -130,7 +130,8 @@ $result_trees{'empty_images'} = {
 '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'type' => 'brace_arg'
             },
@@ -149,7 +150,6 @@ $result_trees{'empty_images'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/coverage_braces/empty_line_in_anchor.pl 
b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
index 74e25e589c..c33274864b 100644
--- a/tp/t/results/coverage_braces/empty_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
@@ -10,7 +10,8 @@ $result_trees{'empty_line_in_anchor'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -26,7 +27,6 @@ $result_trees{'empty_line_in_anchor'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl 
b/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
index e442640ab7..f6bee368b5 100644
--- a/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_braces_in_math.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_line_in_braces_in_math'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -45,7 +46,6 @@ $result_trees{'empty_line_in_braces_in_math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git 
a/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl 
b/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
index d864c2a8db..29dc77f961 100644
--- a/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_braces_in_math_at_begin_line.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_line_in_braces_in_math_at_begin_line'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -52,7 +53,6 @@ $result_trees{'empty_line_in_braces_in_math_at_begin_line'} = 
{
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/empty_line_in_email.pl 
b/tp/t/results/coverage_braces/empty_line_in_email.pl
index bbdf043902..64495759a3 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_line_in_email'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'empty_line_in_email'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/empty_line_in_math.pl 
b/tp/t/results/coverage_braces/empty_line_in_math.pl
index 5022a75af0..36a043cb63 100644
--- a/tp/t/results/coverage_braces/empty_line_in_math.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_math.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_line_in_math'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -31,7 +32,6 @@ $result_trees{'empty_line_in_math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/empty_ref.pl 
b/tp/t/results/coverage_braces/empty_ref.pl
index f1ac39eb0e..215e8543c0 100644
--- a/tp/t/results/coverage_braces/empty_ref.pl
+++ b/tp/t/results/coverage_braces/empty_ref.pl
@@ -17,12 +17,12 @@ $result_trees{'empty_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -31,7 +31,8 @@ $result_trees{'empty_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -47,7 +48,6 @@ $result_trees{'empty_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -56,7 +56,8 @@ $result_trees{'empty_ref'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -66,7 +67,6 @@ $result_trees{'empty_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -79,7 +79,8 @@ $result_trees{'empty_ref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -102,7 +103,6 @@ $result_trees{'empty_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage_braces/empty_second_email_argument.pl 
b/tp/t/results/coverage_braces/empty_second_email_argument.pl
index dab3acf3c1..89cd2ca093 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_second_email_argument'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'empty_second_email_argument'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl 
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index 1f8ddd1766..dcc6dd79dd 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -10,7 +10,8 @@ $result_trees{'end_line_in_anchor'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -24,7 +25,6 @@ $result_trees{'end_line_in_anchor'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'an-anchor'
diff --git a/tp/t/results/coverage_braces/footnote.pl 
b/tp/t/results/coverage_braces/footnote.pl
index 3082bbc673..299af81e01 100644
--- a/tp/t/results/coverage_braces/footnote.pl
+++ b/tp/t/results/coverage_braces/footnote.pl
@@ -15,7 +15,8 @@ $result_trees{'footnote'} = {
               'text' => 'text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -35,7 +36,8 @@ $result_trees{'footnote'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -45,7 +47,6 @@ $result_trees{'footnote'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'r',
                           'source_info' => {
                             'line_nr' => 3
                           }
@@ -60,7 +61,6 @@ $result_trees{'footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
diff --git a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl 
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index 8d5d05e8b8..da97ecc368 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -15,7 +15,8 @@ $result_trees{'footnote_ending_on_empty_line'} = {
               'text' => 'text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,7 +37,6 @@ $result_trees{'footnote_ending_on_empty_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
diff --git 
a/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl 
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
index 07d4e1bfc0..ea1700831e 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
@@ -15,7 +15,8 @@ $result_trees{'footnote_ending_on_empty_line_spaces'} = {
               'text' => 'text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -40,7 +41,6 @@ $result_trees{'footnote_ending_on_empty_line_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
diff --git a/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl 
b/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
index 2d9dafe4ac..696779a181 100644
--- a/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
+++ b/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
@@ -15,14 +15,16 @@ $result_trees{'footnote_in_command_not_closed'} = {
               'text' => 'aaa'
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -37,7 +39,6 @@ $result_trees{'footnote_in_command_not_closed'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -46,7 +47,6 @@ $result_trees{'footnote_in_command_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 129c8209c8..db2f00dd74 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -40,7 +40,8 @@ $result_trees{'footnote_no_node'} = {
               'text' => 'F'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -55,7 +56,6 @@ $result_trees{'footnote_no_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 3
diff --git a/tp/t/results/coverage_braces/footnote_not_closed.pl 
b/tp/t/results/coverage_braces/footnote_not_closed.pl
index c787c6c2b5..d1e18b71bc 100644
--- a/tp/t/results/coverage_braces/footnote_not_closed.pl
+++ b/tp/t/results/coverage_braces/footnote_not_closed.pl
@@ -15,7 +15,8 @@ $result_trees{'footnote_not_closed'} = {
               'text' => 'AAA'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -45,7 +46,6 @@ $result_trees{'footnote_not_closed'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl 
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index 635941e158..ec49a2c63a 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -15,7 +15,8 @@ $result_trees{'format_on_first_footnote_line'} = {
               'text' => 'Texte'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -80,7 +81,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
@@ -104,7 +104,8 @@ $result_trees{'format_on_first_footnote_line'} = {
               'text' => 'Last text '
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -174,7 +175,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 6
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 6310a3b281..360466c412 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -15,7 +15,8 @@ $result_trees{'heading_in_footnote'} = {
               'text' => 'T'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -103,7 +104,6 @@ $result_trees{'heading_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
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 da971c27e2..952397e617 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -37,7 +37,8 @@ $result_trees{'inforef_too_much_args'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -80,7 +81,6 @@ $result_trees{'inforef_too_much_args'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -109,7 +109,7 @@ $result_trees{'inforef_too_much_args'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'inforef_too_much_args'}{'contents'}[1]{'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_texis{'inforef_too_much_args'} = '@node chapter
 
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index 76def94a36..7d838f5316 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -15,7 +15,8 @@ $result_trees{'kbd'} = {
               'text' => 'kbd: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'kbd'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -48,14 +48,16 @@ $result_trees{'kbd'} = {
               'text' => 'kbd in code: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in first '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +67,6 @@ $result_trees{'kbd'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -74,7 +75,6 @@ $result_trees{'kbd'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -97,14 +97,16 @@ $result_trees{'kbd'} = {
               'text' => 'kbd in kbd: '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in top kbd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -114,7 +116,6 @@ $result_trees{'kbd'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -123,7 +124,6 @@ $result_trees{'kbd'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -181,7 +181,8 @@ $result_trees{'kbd'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -191,7 +192,6 @@ $result_trees{'kbd'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -284,7 +284,8 @@ $result_trees{'kbd'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -294,7 +295,6 @@ $result_trees{'kbd'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 18
                   }
diff --git a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl 
b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
index c621bf4bcc..3fd1e73664 100644
--- a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -44,7 +45,6 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl 
b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
index 99708c712b..75f622fd53 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'math_bracketed_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -47,7 +48,6 @@ $result_trees{'math_bracketed_not_closed'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git 
a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl 
b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
index b8f4c4aa99..9c07463258 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
@@ -12,7 +12,8 @@ $result_trees{'math_bracketed_not_closed_next_line'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -42,7 +43,6 @@ $result_trees{'math_bracketed_not_closed_next_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
index 6217c631f9..b9fc82cba2 100644
--- a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
@@ -12,7 +12,8 @@ $result_trees{'math_leading_trailing_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'math_leading_trailing_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage_braces/math_not_closed.pl 
b/tp/t/results/coverage_braces/math_not_closed.pl
index 0c539a1579..37975b5186 100644
--- a/tp/t/results/coverage_braces/math_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'math_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'math_not_closed'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/nested.pl 
b/tp/t/results/coverage_braces/nested.pl
index c95107e2dc..59b28b8d69 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -15,14 +15,16 @@ $result_trees{'nested'} = {
               'text' => 'type the characters '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'l o g o u t '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -32,7 +34,6 @@ $result_trees{'nested'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -41,7 +42,6 @@ $result_trees{'nested'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index 8358d455ae..ce59695c60 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -12,7 +12,8 @@ $result_trees{'nested_args'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,8 @@ $result_trees{'nested_args'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -32,7 +34,6 @@ $result_trees{'nested_args'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -55,7 +56,8 @@ $result_trees{'nested_args'} = {
                       'text' => 'descr '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +67,6 @@ $result_trees{'nested_args'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -84,7 +85,8 @@ $result_trees{'nested_args'} = {
                       'text' => 'S'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -94,7 +96,6 @@ $result_trees{'nested_args'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -113,7 +114,8 @@ $result_trees{'nested_args'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -123,7 +125,6 @@ $result_trees{'nested_args'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -138,7 +139,6 @@ $result_trees{'nested_args'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -155,9 +155,9 @@ $result_trees{'nested_args'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
 $result_texis{'nested_args'} = '@xref{@@ @samp{in samp}, descr @b{in b}, 
S@~{e}ction, 
 @cite{manual}}.';
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index f4cb2a1b56..e2add05184 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -12,18 +12,21 @@ $result_trees{'nested_in_sc'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'aaa '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -33,7 +36,6 @@ $result_trees{'nested_in_sc'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -42,12 +44,12 @@ $result_trees{'nested_in_sc'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -56,12 +58,12 @@ $result_trees{'nested_in_sc'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'TeX',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'TeX',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -70,16 +72,17 @@ $result_trees{'nested_in_sc'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'aa',
+                                      'contents' => [
                                         {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'aa',
                                       'source_info' => {
                                         'line_nr' => 1
                                       }
@@ -88,7 +91,6 @@ $result_trees{'nested_in_sc'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -97,7 +99,8 @@ $result_trees{'nested_in_sc'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'footnote',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -112,7 +115,6 @@ $result_trees{'nested_in_sc'} = {
                                   'type' => 'brace_command_context'
                                 }
                               ],
-                              'cmdname' => 'footnote',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 1
@@ -122,7 +124,8 @@ $result_trees{'nested_in_sc'} = {
                               'text' => ', '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'abbr',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -145,7 +148,6 @@ $result_trees{'nested_in_sc'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'abbr',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -155,7 +157,8 @@ $result_trees{'nested_in_sc'} = {
 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'verb',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -166,7 +169,6 @@ $result_trees{'nested_in_sc'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'verb',
                               'info' => {
                                 'delimiter' => ':'
                               },
@@ -178,7 +180,6 @@ $result_trees{'nested_in_sc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -187,7 +188,6 @@ $result_trees{'nested_in_sc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/no_brace_space_end_line.pl 
b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
index a6582ff980..5961f3bbdf 100644
--- a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
+++ b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
@@ -12,7 +12,8 @@ $result_trees{'no_brace_space_end_line'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'no_brace_space_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index a67fd3073a..51dbbca46c 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -12,7 +12,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -50,7 +50,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -60,7 +61,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -69,7 +69,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -89,7 +89,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'hyphenation',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'hyphenation',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 2
@@ -119,7 +119,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -129,7 +130,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -138,7 +138,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -165,7 +165,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -175,7 +176,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -184,7 +184,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -195,7 +196,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -208,7 +208,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -218,7 +219,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -227,7 +227,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -246,7 +246,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -256,7 +257,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -265,7 +265,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -275,7 +276,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -285,7 +285,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -295,7 +296,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -304,7 +304,8 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -314,7 +315,6 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl 
b/tp/t/results/coverage_braces/recursive_acronym.pl
index 3379df53f6..d41be84f1f 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -12,7 +12,8 @@ $result_trees{'recursive_acronym'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -24,7 +25,8 @@ $result_trees{'recursive_acronym'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -34,7 +36,6 @@ $result_trees{'recursive_acronym'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -51,7 +52,6 @@ $result_trees{'recursive_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl 
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index 9f7bf8d5c5..5b5a04007c 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -12,7 +12,8 @@ $result_trees{'recursive_acronym_definition'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -24,7 +25,8 @@ $result_trees{'recursive_acronym_definition'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -36,7 +38,8 @@ $result_trees{'recursive_acronym_definition'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'acronym',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -59,7 +62,6 @@ $result_trees{'recursive_acronym_definition'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'acronym',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -76,7 +78,6 @@ $result_trees{'recursive_acronym_definition'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -93,7 +94,6 @@ $result_trees{'recursive_acronym_definition'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/ref_empty_node.pl 
b/tp/t/results/coverage_braces/ref_empty_node.pl
index b08eb271b6..9626120eba 100644
--- a/tp/t/results/coverage_braces/ref_empty_node.pl
+++ b/tp/t/results/coverage_braces/ref_empty_node.pl
@@ -17,7 +17,8 @@ $result_trees{'ref_empty_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -36,7 +37,6 @@ $result_trees{'ref_empty_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -45,7 +45,8 @@ $result_trees{'ref_empty_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -77,7 +78,6 @@ $result_trees{'ref_empty_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -86,7 +86,8 @@ $result_trees{'ref_empty_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'inforef',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -102,7 +103,6 @@ $result_trees{'ref_empty_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inforef',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -112,7 +112,8 @@ $result_trees{'ref_empty_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -174,7 +175,6 @@ $result_trees{'ref_empty_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl 
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index 1e657efa3a..8a3420f0e5 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -12,11 +12,13 @@ $result_trees{'ref_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -47,7 +49,6 @@ $result_trees{'ref_in_style_command'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -56,7 +57,6 @@ $result_trees{'ref_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -73,8 +73,8 @@ $result_trees{'ref_in_style_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'ref_in_style_command'} = '@samp{@ref{(manula)other node}}.';
 
diff --git a/tp/t/results/coverage_braces/simple.pl 
b/tp/t/results/coverage_braces/simple.pl
index 3528a5173b..f3ce66a5b3 100644
--- a/tp/t/results/coverage_braces/simple.pl
+++ b/tp/t/results/coverage_braces/simple.pl
@@ -12,7 +12,8 @@ $result_trees{'simple'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl 
b/tp/t/results/coverage_braces/space_command_in_image.pl
index 54b85a26c4..f4dc2bf1d0 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -10,7 +10,8 @@ $result_trees{'space_command_in_image'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -34,7 +35,6 @@ $result_trees{'space_command_in_image'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -46,7 +46,8 @@ $result_trees{'space_command_in_image'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -70,7 +71,6 @@ $result_trees{'space_command_in_image'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl 
b/tp/t/results/coverage_braces/space_in_anchor.pl
index f5376df29f..6839ec08e9 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -10,7 +10,8 @@ $result_trees{'space_in_anchor'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -28,7 +29,6 @@ $result_trees{'space_in_anchor'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'anchor-name'
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl 
b/tp/t/results/coverage_braces/space_in_footnote.pl
index 75adf4e966..6addd5fd50 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -15,7 +15,8 @@ $result_trees{'space_in_footnote'} = {
               'text' => 'text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'space_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
diff --git a/tp/t/results/coverage_braces/space_in_image.pl 
b/tp/t/results/coverage_braces/space_in_image.pl
index 3b4e2c868e..36c0298f33 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -10,7 +10,8 @@ $result_trees{'space_in_image'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -75,7 +76,6 @@ $result_trees{'space_in_image'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -89,7 +89,8 @@ $result_trees{'space_in_image'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'space_in_image'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 1e4c8ead5b..d0f139ff85 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -117,7 +117,8 @@ $result_trees{'test_image'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -151,7 +152,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -162,7 +164,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -221,7 +222,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -232,7 +234,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -245,7 +246,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -272,7 +272,8 @@ $result_trees{'test_image'} = {
                   'text' => 'In text '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -306,7 +307,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -317,7 +319,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -361,15 +362,18 @@ $result_trees{'test_image'} = {
                           'text' => 'alt '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '^',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => 'dotless',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -379,7 +383,6 @@ $result_trees{'test_image'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => 'dotless',
                                           'source_info' => {
                                             'line_nr' => 9,
                                             'macro' => 'files-char'
@@ -389,7 +392,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '^',
                                   'source_info' => {
                                     'line_nr' => 9,
                                     'macro' => 'files-char'
@@ -411,7 +413,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 9,
                             'macro' => 'files-char'
@@ -430,7 +431,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -441,7 +443,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -494,7 +495,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -505,7 +507,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -518,7 +519,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -660,7 +660,8 @@ $result_trees{'test_image'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -694,7 +695,8 @@ $result_trees{'test_image'} = {
                   'cmdname' => '@'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -705,7 +707,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -764,7 +765,8 @@ $result_trees{'test_image'} = {
                   'cmdname' => '@'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -775,7 +777,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -788,7 +789,6 @@ $result_trees{'test_image'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -812,7 +812,8 @@ $result_trees{'test_image'} = {
               'text' => 'In text '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -846,7 +847,8 @@ $result_trees{'test_image'} = {
                       'cmdname' => '@'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -857,7 +859,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -901,15 +902,18 @@ $result_trees{'test_image'} = {
                       'text' => 'alt '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'dotless',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -919,7 +923,6 @@ $result_trees{'test_image'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'dotless',
                                       'source_info' => {
                                         'line_nr' => 15,
                                         'macro' => 'files-char'
@@ -929,7 +932,6 @@ $result_trees{'test_image'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 15,
                                 'macro' => 'files-char'
@@ -951,7 +953,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 15,
                         'macro' => 'files-char'
@@ -970,7 +971,8 @@ $result_trees{'test_image'} = {
                       'cmdname' => '@'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -981,7 +983,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -1034,7 +1035,8 @@ $result_trees{'test_image'} = {
                       'cmdname' => '@'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1045,7 +1047,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -1058,7 +1059,6 @@ $result_trees{'test_image'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -1153,7 +1153,8 @@ $result_trees{'test_image'} = {
                   'text' => ''
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1187,7 +1188,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1198,7 +1200,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1257,7 +1258,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1268,7 +1270,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1281,7 +1282,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1303,7 +1303,8 @@ $result_trees{'test_image'} = {
                   'text' => 'In text '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1337,7 +1338,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1348,7 +1350,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1392,15 +1393,18 @@ $result_trees{'test_image'} = {
                           'text' => 'alt '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '^',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => 'dotless',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -1410,7 +1414,6 @@ $result_trees{'test_image'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => 'dotless',
                                           'source_info' => {
                                             'line_nr' => 21,
                                             'macro' => 'files-char'
@@ -1420,7 +1423,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '^',
                                   'source_info' => {
                                     'line_nr' => 21,
                                     'macro' => 'files-char'
@@ -1442,7 +1444,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 21,
                             'macro' => 'files-char'
@@ -1461,7 +1462,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1472,7 +1474,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1525,7 +1526,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1536,7 +1538,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1549,7 +1550,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -1665,7 +1665,8 @@ $result_trees{'test_image'} = {
               'text' => ''
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1699,7 +1700,8 @@ $result_trees{'test_image'} = {
                       'cmdname' => '@'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1710,7 +1712,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -1769,7 +1770,8 @@ $result_trees{'test_image'} = {
                       'cmdname' => '@'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1780,7 +1782,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -1793,7 +1794,6 @@ $result_trees{'test_image'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -1817,7 +1817,8 @@ $result_trees{'test_image'} = {
                   'text' => 'In text '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1851,7 +1852,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1862,7 +1864,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -1906,15 +1907,18 @@ $result_trees{'test_image'} = {
                           'text' => 'alt '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '^',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => 'dotless',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -1924,7 +1928,6 @@ $result_trees{'test_image'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => 'dotless',
                                           'source_info' => {
                                             'line_nr' => 25,
                                             'macro' => 'files-char'
@@ -1934,7 +1937,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '^',
                                   'source_info' => {
                                     'line_nr' => 25,
                                     'macro' => 'files-char'
@@ -1956,7 +1958,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 25,
                             'macro' => 'files-char'
@@ -1975,7 +1976,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1986,7 +1988,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -2039,7 +2040,8 @@ $result_trees{'test_image'} = {
                           'cmdname' => '@'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2050,7 +2052,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
@@ -2063,7 +2064,6 @@ $result_trees{'test_image'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -2093,7 +2093,8 @@ $result_trees{'test_image'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2118,7 +2119,8 @@ $result_trees{'test_image'} = {
                       'text' => ''
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2152,7 +2154,8 @@ $result_trees{'test_image'} = {
                               'cmdname' => '@'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'verb',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2163,7 +2166,6 @@ $result_trees{'test_image'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'verb',
                               'info' => {
                                 'delimiter' => ':'
                               },
@@ -2222,7 +2224,8 @@ $result_trees{'test_image'} = {
                               'cmdname' => '@'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'verb',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2233,7 +2236,6 @@ $result_trees{'test_image'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'verb',
                               'info' => {
                                 'delimiter' => ':'
                               },
@@ -2246,7 +2248,6 @@ $result_trees{'test_image'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -2270,7 +2271,8 @@ $result_trees{'test_image'} = {
                           'text' => 'In text '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'image',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2304,7 +2306,8 @@ $result_trees{'test_image'} = {
                                   'cmdname' => '@'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'verb',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -2315,7 +2318,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'verb',
                                   'info' => {
                                     'delimiter' => ':'
                                   },
@@ -2359,15 +2361,18 @@ $result_trees{'test_image'} = {
                                   'text' => 'alt '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'b',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => '^',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
-                                                  'args' => [
+                                                  'cmdname' => 'dotless',
+                                                  'contents' => [
                                                     {
                                                       'contents' => [
                                                         {
@@ -2377,7 +2382,6 @@ $result_trees{'test_image'} = {
                                                       'type' => 
'brace_container'
                                                     }
                                                   ],
-                                                  'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'line_nr' => 27,
                                                     'macro' => 'files-char'
@@ -2387,7 +2391,6 @@ $result_trees{'test_image'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '^',
                                           'source_info' => {
                                             'line_nr' => 27,
                                             'macro' => 'files-char'
@@ -2409,7 +2412,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'b',
                                   'source_info' => {
                                     'line_nr' => 27,
                                     'macro' => 'files-char'
@@ -2428,7 +2430,8 @@ $result_trees{'test_image'} = {
                                   'cmdname' => '@'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'verb',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -2439,7 +2442,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'verb',
                                   'info' => {
                                     'delimiter' => ':'
                                   },
@@ -2492,7 +2494,8 @@ $result_trees{'test_image'} = {
                                   'cmdname' => '@'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'verb',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -2503,7 +2506,6 @@ $result_trees{'test_image'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'verb',
                                   'info' => {
                                     'delimiter' => ':'
                                   },
@@ -2516,7 +2518,6 @@ $result_trees{'test_image'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'image',
                           'extra' => {
                             'input_encoding_name' => 'utf-8'
                           },
@@ -2543,7 +2544,6 @@ $result_trees{'test_image'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/coverage_braces/test_w.pl 
b/tp/t/results/coverage_braces/test_w.pl
index 4bf34b5c2e..fa64038825 100644
--- a/tp/t/results/coverage_braces/test_w.pl
+++ b/tp/t/results/coverage_braces/test_w.pl
@@ -12,7 +12,8 @@ $result_trees{'test_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -26,7 +27,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -49,7 +49,8 @@ $result_trees{'test_w'} = {
               'text' => 'a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a  '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -59,7 +60,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -84,12 +84,12 @@ $result_trees{'test_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -109,7 +109,8 @@ $result_trees{'test_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -123,7 +124,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -146,12 +146,12 @@ $result_trees{'test_w'} = {
               'text' => 'AA'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -174,7 +174,8 @@ $result_trees{'test_w'} = {
               'text' => 'FF'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -207,7 +207,8 @@ $result_trees{'test_w'} = {
               'text' => 'aa'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -217,7 +218,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -240,7 +240,8 @@ $result_trees{'test_w'} = {
               'text' => 'aa2'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -250,7 +251,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -278,7 +278,8 @@ $result_trees{'test_w'} = {
               'text' => 'aa3 '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -316,7 +316,8 @@ $result_trees{'test_w'} = {
               'text' => 'aa4 '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -326,7 +327,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -349,12 +349,12 @@ $result_trees{'test_w'} = {
               'text' => 'aa5 '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -377,12 +377,12 @@ $result_trees{'test_w'} = {
               'text' => 'aa6 '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -405,12 +405,12 @@ $result_trees{'test_w'} = {
               'text' => 'aa6'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -433,7 +433,8 @@ $result_trees{'test_w'} = {
               'text' => 'aaf '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -443,7 +444,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -466,23 +466,25 @@ $result_trees{'test_w'} = {
               'text' => 'begin and end quotations: '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '`'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 34
                               }
@@ -491,12 +493,12 @@ $result_trees{'test_w'} = {
                               'text' => '`'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'dots',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dots',
                               'source_info' => {
                                 'line_nr' => 34
                               }
@@ -505,12 +507,12 @@ $result_trees{'test_w'} = {
                               'text' => '\''
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 34
                               }
@@ -522,7 +524,6 @@ $result_trees{'test_w'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -531,7 +532,6 @@ $result_trees{'test_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 34
               }
diff --git a/tp/t/results/coverage_braces/too_much_args.pl 
b/tp/t/results/coverage_braces/too_much_args.pl
index e47c00d5b8..d7ee2399d9 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -12,7 +12,8 @@ $result_trees{'too_much_args'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -35,7 +36,6 @@ $result_trees{'too_much_args'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 1
               }
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 8339421da2..0345c28ab8 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -76,7 +76,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'A'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -105,7 +106,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -129,7 +129,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'B'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -158,7 +159,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 8
@@ -348,7 +348,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'C'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -377,7 +378,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 19
@@ -401,7 +401,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'D'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -430,7 +431,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 23
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 b884673e3f..90f9abfb08 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
@@ -110,7 +110,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'A'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -139,7 +140,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -163,7 +163,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'B'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -192,7 +193,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -382,7 +382,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'C'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -411,7 +412,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 20
@@ -435,7 +435,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'D'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 24
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 b28a42e92d..eefa8404d3 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
@@ -110,7 +110,8 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'text' => 'A'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -139,7 +140,6 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -163,7 +163,8 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'text' => 'B'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -192,7 +193,6 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -382,7 +382,8 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'text' => 'C'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -411,7 +412,6 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 20
@@ -435,7 +435,8 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'text' => 'D'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 24
diff --git a/tp/t/results/coverage_braces/unmatched_brace.pl 
b/tp/t/results/coverage_braces/unmatched_brace.pl
index 63d991db19..be6824884e 100644
--- a/tp/t/results/coverage_braces/unmatched_brace.pl
+++ b/tp/t/results/coverage_braces/unmatched_brace.pl
@@ -12,7 +12,8 @@ $result_trees{'unmatched_brace'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'unmatched_brace'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'unmatched_brace'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -47,7 +48,6 @@ $result_trees{'unmatched_brace'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl 
b/tp/t/results/coverage_braces/uref_in_ref.pl
index 70904f6d7c..71272d173d 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -12,7 +12,8 @@ $result_trees{'uref_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -48,7 +49,8 @@ $result_trees{'uref_in_ref'} = {
                       'text' => 'cross ref with uref '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -66,7 +68,6 @@ $result_trees{'uref_in_ref'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -85,7 +86,8 @@ $result_trees{'uref_in_ref'} = {
                       'text' => 'title with uref2 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -103,7 +105,6 @@ $result_trees{'uref_in_ref'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -122,7 +123,8 @@ $result_trees{'uref_in_ref'} = {
                       'text' => 'info file with uref3 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -140,7 +142,6 @@ $result_trees{'uref_in_ref'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -159,7 +160,8 @@ $result_trees{'uref_in_ref'} = {
                       'text' => 'printed manual with uref4 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -177,7 +179,6 @@ $result_trees{'uref_in_ref'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -191,7 +192,6 @@ $result_trees{'uref_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -209,8 +209,8 @@ $result_trees{'uref_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'uref_in_ref'} = '@ref{(file)node, cross ref with uref 
@uref{href://http/myhost.com/index.html,uref1}, title with uref2 
@uref{href://http/myhost.com/index2.html,uref2}, info file with uref3 
@uref{href://http/myhost.com/index3.html,uref3}, printed manual with uref4 
@uref{href://http/myhost.com/index4.html,uref4}}
 ';
diff --git a/tp/t/results/coverage_braces/uref_url.pl 
b/tp/t/results/coverage_braces/uref_url.pl
index d6480dbf05..c58b6b1f9c 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -12,7 +12,8 @@ $result_trees{'uref_url'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -40,7 +40,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -60,7 +60,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -73,7 +74,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -83,7 +83,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -109,7 +110,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -119,7 +119,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -140,7 +141,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -150,7 +150,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -171,7 +172,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -181,7 +181,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -197,7 +198,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -207,7 +207,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -225,7 +226,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -235,7 +235,8 @@ $result_trees{'uref_url'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -261,7 +262,6 @@ $result_trees{'uref_url'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl 
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
index 1650111ace..262daaee0c 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -12,14 +12,16 @@ $result_trees{'uref_with_commands_characters'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'http://my-host.com/~'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -29,7 +31,6 @@ $result_trees{'uref_with_commands_characters'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -64,16 +65,17 @@ $result_trees{'uref_with_commands_characters'} = {
                       'text' => 'see that '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'LaTeX',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'LaTeX',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -82,7 +84,6 @@ $result_trees{'uref_with_commands_characters'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -96,7 +97,6 @@ $result_trees{'uref_with_commands_characters'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 1e8c1e16b8..0506c02975 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -10,7 +10,8 @@ $result_trees{'verb_in_xref'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'verb_in_xref'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'point'
@@ -42,7 +42,8 @@ $result_trees{'verb_in_xref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -62,7 +63,8 @@ $result_trees{'verb_in_xref'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -88,7 +90,6 @@ $result_trees{'verb_in_xref'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '*'
                       },
@@ -105,7 +106,6 @@ $result_trees{'verb_in_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -123,7 +123,7 @@ $result_trees{'verb_in_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'verb_in_xref'} = '@anchor{point}
 
diff --git a/tp/t/results/coverage_braces/w_end_sentence.pl 
b/tp/t/results/coverage_braces/w_end_sentence.pl
index a72cc55a9d..e807083521 100644
--- a/tp/t/results/coverage_braces/w_end_sentence.pl
+++ b/tp/t/results/coverage_braces/w_end_sentence.pl
@@ -15,7 +15,8 @@ $result_trees{'w_end_sentence'} = {
               'text' => 'a. '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'w_end_sentence'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 9e825572d5..32ce085d4b 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -38,7 +38,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -68,7 +68,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -78,7 +79,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -225,7 +225,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -235,7 +236,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 2
                               }
@@ -259,7 +259,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -269,7 +270,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 2
                               }
@@ -322,7 +322,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -332,7 +333,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 2
                               }
@@ -402,7 +402,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -411,8 +412,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -649,7 +649,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -659,7 +660,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -683,7 +683,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -693,7 +694,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -746,7 +746,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -756,7 +757,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -977,7 +977,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -987,7 +988,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -1028,7 +1028,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1038,7 +1039,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -1221,7 +1221,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1231,7 +1232,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -1272,7 +1272,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1282,7 +1283,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -1392,7 +1392,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1402,7 +1403,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 13
                               }
@@ -1426,7 +1426,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1436,7 +1437,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 13
                               }
@@ -1489,7 +1489,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1499,7 +1500,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 13
                               }
@@ -1901,7 +1901,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1911,7 +1912,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 19
                               }
@@ -1985,7 +1985,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1995,7 +1996,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 20
                               }
@@ -2359,7 +2359,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2369,7 +2370,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2393,7 +2393,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2403,7 +2404,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2456,7 +2456,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2466,7 +2467,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -2770,7 +2770,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2780,7 +2781,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2804,7 +2804,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2814,7 +2815,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2867,7 +2867,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2877,7 +2878,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -3164,7 +3164,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3174,7 +3175,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -3198,7 +3198,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3208,7 +3209,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -3261,7 +3261,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3271,7 +3272,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 32
                               }
@@ -3454,7 +3454,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3464,7 +3465,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 35
                               }
@@ -3588,7 +3588,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3598,7 +3599,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 36
                               }
@@ -3622,7 +3622,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3632,7 +3633,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 36
                               }
@@ -3685,7 +3685,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3695,7 +3696,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 36
                               }
@@ -4032,7 +4032,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4042,7 +4043,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 40
                               }
@@ -4066,7 +4066,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4076,7 +4077,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 40
                               }
@@ -4129,7 +4129,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4139,7 +4140,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 40
                               }
@@ -4372,7 +4372,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4382,7 +4383,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 43
                               }
@@ -4506,7 +4506,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4516,7 +4517,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 44
                               }
@@ -4540,7 +4540,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4550,7 +4551,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 44
                               }
@@ -4603,7 +4603,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4613,7 +4614,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 44
                               }
@@ -4846,7 +4846,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4856,7 +4857,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 47
                               }
@@ -5101,7 +5101,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5111,7 +5112,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 50
                               }
@@ -5359,7 +5359,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5369,7 +5370,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 53
                               }
@@ -5614,7 +5614,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5624,7 +5625,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 56
                               }
@@ -5866,7 +5866,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5876,7 +5877,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 59
                               }
@@ -6121,7 +6121,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6131,7 +6132,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 62
                               }
@@ -6379,7 +6379,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6389,7 +6390,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -6634,7 +6634,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6644,7 +6645,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 68
                               }
@@ -6886,7 +6886,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6896,7 +6897,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 71
                               }
@@ -7141,7 +7141,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7151,7 +7152,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 74
                               }
@@ -7399,7 +7399,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7409,7 +7410,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 77
                               }
@@ -7654,7 +7654,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7664,7 +7665,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 80
                               }
@@ -7906,7 +7906,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7916,7 +7917,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 83
                               }
@@ -8127,7 +8127,8 @@ $result_trees{'all_commands_delimiters'} = {
                               'text' => 'Command'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8137,7 +8138,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 86
                               }
@@ -8160,7 +8160,8 @@ $result_trees{'all_commands_delimiters'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8170,7 +8171,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 86
                               }
@@ -8196,7 +8196,8 @@ $result_trees{'all_commands_delimiters'} = {
                               'text' => 'expose'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8206,7 +8207,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 86
                               }
@@ -8272,7 +8272,8 @@ $result_trees{'all_commands_delimiters'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8281,8 +8282,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'bracketed_arg'
@@ -8318,7 +8318,8 @@ $result_trees{'all_commands_delimiters'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8327,8 +8328,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'bracketed_arg'
@@ -8581,7 +8581,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8591,7 +8592,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 92
                               }
@@ -8611,7 +8611,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8621,7 +8622,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 92
                               }
@@ -8641,7 +8641,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8651,7 +8652,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 92
                               }
@@ -8671,7 +8671,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8681,7 +8682,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 92
                               }
@@ -8709,7 +8709,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -8718,8 +8719,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -8795,7 +8795,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8805,7 +8806,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8825,7 +8825,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8835,7 +8836,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8855,7 +8855,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8865,7 +8866,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8885,7 +8885,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8895,7 +8896,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8923,7 +8923,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -8932,8 +8933,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9009,7 +9009,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9019,7 +9020,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -9039,7 +9039,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9049,7 +9050,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -9069,7 +9069,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9079,7 +9080,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -9099,7 +9099,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9109,7 +9110,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -9137,7 +9137,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9146,8 +9147,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9223,7 +9223,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9233,7 +9234,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9253,7 +9253,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9263,7 +9264,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9283,7 +9283,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9293,7 +9294,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9313,7 +9313,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9323,7 +9324,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9351,7 +9351,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9360,8 +9361,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9437,7 +9437,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9447,7 +9448,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9467,7 +9467,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9477,7 +9478,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9497,7 +9497,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9507,7 +9508,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9527,7 +9527,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9537,7 +9538,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9557,7 +9557,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9567,7 +9568,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9595,7 +9595,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9604,8 +9605,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9681,7 +9681,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9691,7 +9692,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9711,7 +9711,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9721,7 +9722,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9741,7 +9741,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9751,7 +9752,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9771,7 +9771,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9781,7 +9782,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9801,7 +9801,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9811,7 +9812,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9839,7 +9839,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9848,8 +9849,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9925,7 +9925,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9935,7 +9936,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9955,7 +9955,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9965,7 +9966,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9985,7 +9985,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9995,7 +9996,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -10015,7 +10015,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10025,7 +10026,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -10045,7 +10045,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10055,7 +10056,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -10083,7 +10083,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10092,8 +10093,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10169,7 +10169,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10179,7 +10180,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10199,7 +10199,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10209,7 +10210,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10229,7 +10229,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10239,7 +10240,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10259,7 +10259,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10269,7 +10270,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10289,7 +10289,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10299,7 +10300,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10327,7 +10327,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10336,8 +10337,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10413,7 +10413,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10423,7 +10424,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10443,7 +10443,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10453,7 +10454,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10473,7 +10473,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10483,7 +10484,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10503,7 +10503,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10513,7 +10514,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10541,7 +10541,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10550,8 +10551,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10627,7 +10627,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10637,7 +10638,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10657,7 +10657,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10667,7 +10668,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10687,7 +10687,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10697,7 +10698,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10717,7 +10717,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10727,7 +10728,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10755,7 +10755,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10764,8 +10765,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10841,7 +10841,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10851,7 +10852,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10871,7 +10871,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10881,7 +10882,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10901,7 +10901,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10911,7 +10912,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10931,7 +10931,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10941,7 +10942,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10961,7 +10961,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10971,7 +10972,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10999,7 +10999,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -11008,8 +11009,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -11085,7 +11085,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11095,7 +11096,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11115,7 +11115,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11125,7 +11126,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11145,7 +11145,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11155,7 +11156,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11175,7 +11175,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11185,7 +11186,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11205,7 +11205,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11215,7 +11216,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11243,7 +11243,8 @@ $result_trees{'all_commands_delimiters'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -11252,8 +11253,7 @@ $result_trees{'all_commands_delimiters'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -11329,7 +11329,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11339,7 +11340,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11359,7 +11359,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11369,7 +11370,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11389,7 +11389,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11399,7 +11400,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11419,7 +11419,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11429,7 +11430,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11449,7 +11449,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11459,7 +11460,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11479,7 +11479,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11489,7 +11490,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11519,7 +11519,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11528,8 +11529,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11545,7 +11545,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11554,8 +11555,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11572,7 +11572,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11581,8 +11582,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11598,7 +11598,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11607,8 +11608,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11686,7 +11686,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11696,7 +11697,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11716,7 +11716,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11726,7 +11727,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11746,7 +11746,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'option',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11756,7 +11757,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'option',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11776,7 +11776,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11786,7 +11787,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11806,7 +11806,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11816,7 +11817,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11836,7 +11836,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11846,7 +11847,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11876,7 +11876,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11885,8 +11886,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11902,7 +11902,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11911,8 +11912,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11929,7 +11929,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11938,8 +11939,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11955,7 +11955,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11964,8 +11965,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12043,7 +12043,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12053,7 +12054,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -12073,7 +12073,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12083,7 +12084,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -12103,7 +12103,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12113,7 +12114,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -12133,7 +12133,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12143,7 +12144,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -12163,7 +12163,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12173,7 +12174,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -12203,7 +12203,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12212,8 +12213,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12229,7 +12229,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12238,8 +12239,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12256,7 +12256,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12265,8 +12266,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12282,7 +12282,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12291,8 +12292,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12370,7 +12370,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12380,7 +12381,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12400,7 +12400,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12410,7 +12411,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12430,7 +12430,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12440,7 +12441,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12460,7 +12460,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12470,7 +12471,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12490,7 +12490,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12500,7 +12501,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12530,7 +12530,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12539,8 +12540,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12556,7 +12556,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12565,8 +12566,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12583,7 +12583,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12592,8 +12593,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12609,7 +12609,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12618,8 +12619,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12697,7 +12697,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12707,7 +12708,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12727,7 +12727,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12737,7 +12738,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12757,7 +12757,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12767,7 +12768,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12787,7 +12787,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12797,7 +12798,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12817,7 +12817,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12827,7 +12828,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12847,7 +12847,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12857,7 +12858,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12887,7 +12887,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12896,8 +12897,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12913,7 +12913,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12922,8 +12923,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12940,7 +12940,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12949,8 +12950,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12966,7 +12966,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12975,8 +12976,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13054,7 +13054,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13064,7 +13065,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13084,7 +13084,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13094,7 +13095,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13114,7 +13114,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13124,7 +13125,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13144,7 +13144,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13154,7 +13155,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13174,7 +13174,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13184,7 +13185,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13204,7 +13204,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13214,7 +13215,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -13244,7 +13244,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13253,8 +13254,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13270,7 +13270,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13279,8 +13280,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13297,7 +13297,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13306,8 +13307,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13323,7 +13323,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13332,8 +13333,7 @@ $result_trees{'all_commands_delimiters'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13471,7 +13471,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13481,7 +13482,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13501,7 +13501,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13511,7 +13512,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13531,7 +13531,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13541,7 +13542,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13561,7 +13561,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13571,7 +13572,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13735,7 +13735,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13745,7 +13746,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13765,7 +13765,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13775,7 +13776,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13795,7 +13795,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13805,7 +13806,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13825,7 +13825,8 @@ $result_trees{'all_commands_delimiters'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13835,7 +13836,6 @@ $result_trees{'all_commands_delimiters'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 149
                               }
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 8f140b8e1a..82833b106d 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -94,7 +94,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -104,7 +105,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -124,7 +124,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -134,7 +135,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -281,7 +281,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -291,7 +292,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -315,7 +315,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -325,7 +326,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -378,7 +378,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -388,7 +389,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -458,7 +458,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -467,8 +468,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -706,7 +706,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -716,7 +717,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -740,7 +740,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -750,7 +751,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -803,7 +803,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -813,7 +814,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -1035,7 +1035,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1045,7 +1046,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -1086,7 +1086,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1096,7 +1097,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -1280,7 +1280,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1290,7 +1291,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -1331,7 +1331,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1341,7 +1342,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -1451,7 +1451,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1461,7 +1462,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1485,7 +1485,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1495,7 +1496,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1548,7 +1548,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1558,7 +1559,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1962,7 +1962,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1972,7 +1973,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -2046,7 +2046,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2056,7 +2057,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 23
                               }
@@ -2421,7 +2421,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2431,7 +2432,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -2455,7 +2455,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2465,7 +2466,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -2518,7 +2518,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2528,7 +2529,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 27
                               }
@@ -2833,7 +2833,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2843,7 +2844,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -2867,7 +2867,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2877,7 +2878,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -2930,7 +2930,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2940,7 +2941,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -3228,7 +3228,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3238,7 +3239,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 35
                               }
@@ -3262,7 +3262,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3272,7 +3273,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 35
                               }
@@ -3325,7 +3325,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3335,7 +3336,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 35
                               }
@@ -3519,7 +3519,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3529,7 +3530,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 38
                               }
@@ -3653,7 +3653,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3663,7 +3664,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 39
                               }
@@ -3687,7 +3687,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3697,7 +3698,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 39
                               }
@@ -3750,7 +3750,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3760,7 +3761,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 39
                               }
@@ -4098,7 +4098,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4108,7 +4109,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 43
                               }
@@ -4132,7 +4132,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4142,7 +4143,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 43
                               }
@@ -4195,7 +4195,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4205,7 +4206,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 43
                               }
@@ -4439,7 +4439,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4449,7 +4450,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 46
                               }
@@ -4573,7 +4573,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4583,7 +4584,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 47
                               }
@@ -4607,7 +4607,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4617,7 +4618,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 47
                               }
@@ -4670,7 +4670,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4680,7 +4681,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 47
                               }
@@ -4914,7 +4914,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -4924,7 +4925,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 50
                               }
@@ -5170,7 +5170,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5180,7 +5181,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 53
                               }
@@ -5429,7 +5429,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5439,7 +5440,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 56
                               }
@@ -5685,7 +5685,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5695,7 +5696,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 59
                               }
@@ -5938,7 +5938,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -5948,7 +5949,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 62
                               }
@@ -6194,7 +6194,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6204,7 +6205,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 65
                               }
@@ -6453,7 +6453,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6463,7 +6464,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 68
                               }
@@ -6709,7 +6709,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6719,7 +6720,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 71
                               }
@@ -6962,7 +6962,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -6972,7 +6973,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 74
                               }
@@ -7218,7 +7218,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7228,7 +7229,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 77
                               }
@@ -7477,7 +7477,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7487,7 +7488,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 80
                               }
@@ -7733,7 +7733,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7743,7 +7744,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 83
                               }
@@ -7986,7 +7986,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -7996,7 +7997,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 86
                               }
@@ -8208,7 +8208,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               'text' => 'Command'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8218,7 +8219,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 89
                               }
@@ -8241,7 +8241,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8251,7 +8252,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 89
                               }
@@ -8277,7 +8277,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               'text' => 'expose'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8287,7 +8288,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 89
                               }
@@ -8353,7 +8353,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8362,8 +8363,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'bracketed_arg'
@@ -8399,7 +8399,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8408,8 +8409,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'bracketed_arg'
@@ -8664,7 +8664,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8674,7 +8675,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8694,7 +8694,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8704,7 +8705,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8724,7 +8724,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8734,7 +8735,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8754,7 +8754,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8764,7 +8765,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -8792,7 +8792,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -8801,8 +8802,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -8879,7 +8879,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8889,7 +8890,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -8909,7 +8909,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8919,7 +8920,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -8939,7 +8939,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8949,7 +8950,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -8969,7 +8969,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -8979,7 +8980,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 98
                               }
@@ -9007,7 +9007,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9016,8 +9017,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9094,7 +9094,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9104,7 +9105,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9124,7 +9124,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9134,7 +9135,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9154,7 +9154,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9164,7 +9165,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9184,7 +9184,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9194,7 +9195,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 101
                               }
@@ -9222,7 +9222,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9231,8 +9232,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9309,7 +9309,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9319,7 +9320,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9339,7 +9339,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9349,7 +9350,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9369,7 +9369,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9379,7 +9380,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9399,7 +9399,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9409,7 +9410,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 104
                               }
@@ -9437,7 +9437,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9446,8 +9447,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9524,7 +9524,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9534,7 +9535,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9554,7 +9554,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9564,7 +9565,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9584,7 +9584,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9594,7 +9595,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9614,7 +9614,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9624,7 +9625,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9644,7 +9644,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9654,7 +9655,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -9682,7 +9682,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9691,8 +9692,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -9769,7 +9769,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9779,7 +9780,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9799,7 +9799,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9809,7 +9810,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9829,7 +9829,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9839,7 +9840,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9859,7 +9859,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9869,7 +9870,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9889,7 +9889,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -9899,7 +9900,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 110
                               }
@@ -9927,7 +9927,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -9936,8 +9937,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10014,7 +10014,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10024,7 +10025,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10044,7 +10044,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10054,7 +10055,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10074,7 +10074,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10084,7 +10085,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10104,7 +10104,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10114,7 +10115,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10134,7 +10134,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10144,7 +10145,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 113
                               }
@@ -10172,7 +10172,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10181,8 +10182,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10259,7 +10259,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10269,7 +10270,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10289,7 +10289,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 't',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10299,7 +10300,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 't',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10319,7 +10319,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10329,7 +10330,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10349,7 +10349,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10359,7 +10360,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10379,7 +10379,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10389,7 +10390,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 116
                               }
@@ -10417,7 +10417,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10426,8 +10427,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10504,7 +10504,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10514,7 +10515,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10534,7 +10534,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10544,7 +10545,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10564,7 +10564,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10574,7 +10575,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10594,7 +10594,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10604,7 +10605,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 119
                               }
@@ -10632,7 +10632,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10641,8 +10642,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10719,7 +10719,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10729,7 +10730,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10749,7 +10749,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10759,7 +10760,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10779,7 +10779,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10789,7 +10790,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10809,7 +10809,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10819,7 +10820,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 122
                               }
@@ -10847,7 +10847,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -10856,8 +10857,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -10934,7 +10934,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10944,7 +10945,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -10964,7 +10964,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10974,7 +10975,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -10994,7 +10994,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11004,7 +11005,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11024,7 +11024,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11034,7 +11035,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11054,7 +11054,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11064,7 +11065,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 125
                               }
@@ -11092,7 +11092,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -11101,8 +11102,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -11179,7 +11179,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11189,7 +11190,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11209,7 +11209,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11219,7 +11220,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11239,7 +11239,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11249,7 +11250,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11269,7 +11269,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11279,7 +11280,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11299,7 +11299,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11309,7 +11310,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 128
                               }
@@ -11337,7 +11337,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -11346,8 +11347,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -11424,7 +11424,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11434,7 +11435,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11454,7 +11454,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11464,7 +11465,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11484,7 +11484,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11494,7 +11495,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11514,7 +11514,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11524,7 +11525,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11544,7 +11544,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11554,7 +11555,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11574,7 +11574,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11584,7 +11585,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 131
                               }
@@ -11614,7 +11614,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11623,8 +11624,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11640,7 +11640,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11649,8 +11650,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11667,7 +11667,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11676,8 +11677,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11693,7 +11693,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11702,8 +11703,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11782,7 +11782,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11792,7 +11793,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11812,7 +11812,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11822,7 +11823,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11842,7 +11842,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'option',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11852,7 +11853,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'option',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11872,7 +11872,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11882,7 +11883,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11902,7 +11902,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11912,7 +11913,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11932,7 +11932,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11942,7 +11943,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 134
                               }
@@ -11972,7 +11972,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11981,8 +11982,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -11998,7 +11998,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12007,8 +12008,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12025,7 +12025,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12034,8 +12035,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12051,7 +12051,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12060,8 +12061,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12140,7 +12140,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12150,7 +12151,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12170,7 +12170,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12180,7 +12181,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12200,7 +12200,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12210,7 +12211,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12230,7 +12230,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12240,7 +12241,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12260,7 +12260,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12270,7 +12271,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 137
                               }
@@ -12300,7 +12300,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12309,8 +12310,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12326,7 +12326,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12335,8 +12336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12353,7 +12353,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12362,8 +12363,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12379,7 +12379,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12388,8 +12389,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12468,7 +12468,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12478,7 +12479,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12498,7 +12498,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12508,7 +12509,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12528,7 +12528,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12538,7 +12539,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12558,7 +12558,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12568,7 +12569,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12588,7 +12588,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12598,7 +12599,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 140
                               }
@@ -12628,7 +12628,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12637,8 +12638,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12654,7 +12654,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12663,8 +12664,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12681,7 +12681,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12690,8 +12691,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12707,7 +12707,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12716,8 +12717,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -12796,7 +12796,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12806,7 +12807,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12826,7 +12826,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12836,7 +12837,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12856,7 +12856,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12866,7 +12867,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12886,7 +12886,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12896,7 +12897,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12916,7 +12916,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12926,7 +12927,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12946,7 +12946,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12956,7 +12957,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -12986,7 +12986,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12995,8 +12996,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13012,7 +13012,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13021,8 +13022,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13039,7 +13039,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13048,8 +13049,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13065,7 +13065,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13074,8 +13075,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13154,7 +13154,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13164,7 +13165,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13184,7 +13184,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13194,7 +13195,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13214,7 +13214,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13224,7 +13225,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13244,7 +13244,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13254,7 +13255,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13274,7 +13274,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13284,7 +13285,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13304,7 +13304,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13314,7 +13315,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -13344,7 +13344,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13353,8 +13354,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13370,7 +13370,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13379,8 +13380,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13397,7 +13397,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13406,8 +13407,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13423,7 +13423,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13432,8 +13433,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'code'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -13572,7 +13572,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13582,7 +13583,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13602,7 +13602,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13612,7 +13613,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13632,7 +13632,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13642,7 +13643,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13662,7 +13662,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13672,7 +13673,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 149
                               }
@@ -13837,7 +13837,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13847,7 +13848,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 152
                               }
@@ -13867,7 +13867,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13877,7 +13878,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 152
                               }
@@ -13897,7 +13897,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13907,7 +13908,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 152
                               }
@@ -13927,7 +13927,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -13937,7 +13938,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 152
                               }
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index f936061175..c9ed0bd4b1 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -79,7 +79,8 @@ $result_trees{'ampchar'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -92,7 +93,6 @@ $result_trees{'ampchar'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -248,12 +248,12 @@ $result_trees{'ampchar'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ampchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ampchar',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 6e22536e1c..abf89e900d 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -76,7 +76,8 @@ $result_trees{'code_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -89,7 +90,6 @@ $result_trees{'code_in_def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -165,7 +165,8 @@ $result_trees{'code_in_def'} = {
                       'text' => 'Documentation of '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -175,7 +176,6 @@ $result_trees{'code_in_def'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 2
                       }
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 0076f3fdcc..2f5f10b579 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -81,7 +81,8 @@ $result_trees{'def_defx_mismatch'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -91,7 +92,6 @@ $result_trees{'def_defx_mismatch'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -111,12 +111,12 @@ $result_trees{'def_defx_mismatch'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dots',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dots',
                               'source_info' => {
                                 'line_nr' => 1
                               }
diff --git a/tp/t/results/def/def_groupings_args.pl 
b/tp/t/results/def/def_groupings_args.pl
index 816fb7b08c..e4be9aacca 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -41,7 +41,8 @@ $result_trees{'def_groupings_args'} = {
                               'text' => 'b'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -51,7 +52,6 @@ $result_trees{'def_groupings_args'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -85,7 +85,8 @@ $result_trees{'def_groupings_args'} = {
                           'text' => 'b'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -94,8 +95,7 @@ $result_trees{'def_groupings_args'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         },
                         {
                           'text' => 'c'
@@ -177,7 +177,8 @@ $result_trees{'def_groupings_args'} = {
                               'text' => 'a'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'samp',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -187,7 +188,6 @@ $result_trees{'def_groupings_args'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'samp',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -274,7 +274,8 @@ $result_trees{'def_groupings_args'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -284,7 +285,6 @@ $result_trees{'def_groupings_args'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 7
                               }
@@ -310,7 +310,8 @@ $result_trees{'def_groupings_args'} = {
                               'text' => 'br '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'samp',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -320,7 +321,6 @@ $result_trees{'def_groupings_args'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'samp',
                               'source_info' => {
                                 'line_nr' => 7
                               }
@@ -356,7 +356,8 @@ $result_trees{'def_groupings_args'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -366,7 +367,6 @@ $result_trees{'def_groupings_args'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 7
                               }
@@ -401,7 +401,8 @@ $result_trees{'def_groupings_args'} = {
                           'text' => 'br '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -410,8 +411,7 @@ $result_trees{'def_groupings_args'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'samp'
+                          ]
                         }
                       ],
                       'type' => 'bracketed_arg'
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index 69ebc05ee8..bb498d95b3 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -110,7 +110,8 @@ $result_trees{'deftypeline'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -120,7 +121,6 @@ $result_trees{'deftypeline'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 2
                               }
@@ -161,7 +161,8 @@ $result_trees{'deftypeline'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -171,7 +172,6 @@ $result_trees{'deftypeline'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 2
                               }
@@ -228,12 +228,12 @@ $result_trees{'deftypeline'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index cbb807ab7f..2fd87d14ef 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -38,7 +38,8 @@ $result_trees{'defx_after_comment'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'defx_after_comment'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'defx_after_comment'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'defx_after_comment'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index 6511e9c1ac..5d3263735c 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -52,7 +52,8 @@ $result_trees{'defx_after_comment_in_example'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -62,7 +63,6 @@ $result_trees{'defx_after_comment_in_example'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 2
                                   }
@@ -124,7 +124,8 @@ $result_trees{'defx_after_comment_in_example'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -133,8 +134,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 60e951f320..162fb063c1 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -38,7 +38,8 @@ $result_trees{'defx_after_empty_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'defx_after_empty_line'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'defx_after_empty_line'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'defx_after_empty_line'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index 499187ea9c..9ed0e3a62b 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -52,7 +52,8 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -62,7 +63,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 2
                                   }
@@ -124,7 +124,8 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -133,8 +134,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 225d206c33..62e1e2fea1 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -38,7 +38,8 @@ $result_trees{'defx_after_paragraph_end'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'defx_after_paragraph_end'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'defx_after_paragraph_end'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'defx_after_paragraph_end'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index 5dcb2d369d..574e88ef09 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -52,7 +52,8 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -62,7 +63,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 2
                                   }
@@ -124,7 +124,8 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -133,8 +134,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index bd14c94950..bed4aba61d 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -38,7 +38,8 @@ $result_trees{'defx_after_text'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'defx_after_text'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'defx_after_text'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'defx_after_text'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 56b7a37340..011fd3b34d 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -52,7 +52,8 @@ $result_trees{'defx_in_example'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -62,7 +63,6 @@ $result_trees{'defx_in_example'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 2
                                   }
@@ -124,7 +124,8 @@ $result_trees{'defx_in_example'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -133,8 +134,7 @@ $result_trees{'defx_in_example'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index bee8b9683d..acdf7db733 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -38,7 +38,8 @@ $result_trees{'empty_def_arguments'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'empty_def_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'empty_def_arguments'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'empty_def_arguments'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -148,14 +148,16 @@ $result_trees{'empty_def_arguments'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
                                       'text' => 'id '
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'samp',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -165,7 +167,6 @@ $result_trees{'empty_def_arguments'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'samp',
                                       'source_info' => {
                                         'line_nr' => 2
                                       }
@@ -177,7 +178,6 @@ $result_trees{'empty_def_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 2
                               }
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 85dfb1d320..6ad9a6378d 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -24,7 +24,8 @@ $result_trees{'empty_deftypeop_name'} = {
                               'text' => 'Command'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -34,7 +35,6 @@ $result_trees{'empty_deftypeop_name'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -57,7 +57,8 @@ $result_trees{'empty_deftypeop_name'} = {
                               'text' => 'Window'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -67,7 +68,6 @@ $result_trees{'empty_deftypeop_name'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -93,7 +93,8 @@ $result_trees{'empty_deftypeop_name'} = {
                               'text' => 'expose'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -103,7 +104,6 @@ $result_trees{'empty_deftypeop_name'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index cc33d8b77f..6aa68f59f0 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -12,7 +12,8 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -325,7 +326,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index efb917e803..abc0f72c6f 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -38,7 +38,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -48,7 +49,6 @@ $result_trees{'inter_item_commands_in_def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 1
                               }
@@ -110,7 +110,8 @@ $result_trees{'inter_item_commands_in_def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -119,8 +120,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -328,14 +328,16 @@ $result_trees{'inter_item_commands_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
                                       'text' => 'id '
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'samp',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -345,7 +347,6 @@ $result_trees{'inter_item_commands_in_def'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'samp',
                                       'source_info' => {
                                         'line_nr' => 6
                                       }
@@ -357,7 +358,6 @@ $result_trees{'inter_item_commands_in_def'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -403,14 +403,16 @@ $result_trees{'inter_item_commands_in_def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'id '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'samp',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -419,8 +421,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'samp'
+                                  ]
                                 },
                                 {
                                   'text' => ' ule'
@@ -428,8 +429,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'b'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 2d5e82aad6..6686eeadf7 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -52,7 +52,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -62,7 +63,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'var',
                                   'source_info' => {
                                     'line_nr' => 2
                                   }
@@ -124,7 +124,8 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -133,8 +134,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'var'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
@@ -352,14 +352,16 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'b',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
                                           'text' => 'id '
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => 'samp',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -369,7 +371,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => 'samp',
                                           'source_info' => {
                                             'line_nr' => 7
                                           }
@@ -381,7 +382,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'b',
                                   'source_info' => {
                                     'line_nr' => 7
                                   }
@@ -427,14 +427,16 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
                                       'text' => 'id '
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'samp',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -443,8 +445,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                           ],
                                           'type' => 'brace_container'
                                         }
-                                      ],
-                                      'cmdname' => 'samp'
+                                      ]
                                     },
                                     {
                                       'text' => ' ule'
@@ -452,8 +453,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'b'
+                              ]
                             }
                           ],
                           'type' => 'def_line_arg'
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 43e6fd5817..719d11c67c 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -53,7 +53,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -71,7 +72,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -91,7 +91,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -109,7 +110,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -129,7 +129,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -147,7 +148,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -170,7 +170,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -188,7 +189,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -208,7 +208,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -226,7 +227,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 4
                               }
@@ -254,7 +254,8 @@ $result_trees{'ref_in_def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -270,8 +271,7 @@ $result_trees{'ref_in_def'} = {
                               },
                               'type' => 'brace_arg'
                             }
-                          ],
-                          'cmdname' => 'ref'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -300,7 +300,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -318,7 +319,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -338,7 +338,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -356,7 +357,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -376,7 +376,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -394,7 +395,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -417,7 +417,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -435,7 +436,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -455,7 +455,8 @@ $result_trees{'ref_in_def'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'pxref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -473,7 +474,6 @@ $result_trees{'ref_in_def'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'pxref',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -502,7 +502,8 @@ $result_trees{'ref_in_def'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -518,8 +519,7 @@ $result_trees{'ref_in_def'} = {
                               },
                               'type' => 'brace_arg'
                             }
-                          ],
-                          'cmdname' => 'ref'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -603,7 +603,8 @@ $result_trees{'ref_in_def'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -613,7 +614,6 @@ $result_trees{'ref_in_def'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'myanchor'
@@ -644,19 +644,19 @@ $result_trees{'ref_in_def'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[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]{'args'}[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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'args'}[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]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[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_texis{'ref_in_def'} = '
diff --git a/tp/t/results/def/text_block_before_defline.pl 
b/tp/t/results/def/text_block_before_defline.pl
index 739f16e6bb..455b0015e0 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -158,7 +158,8 @@ $result_trees{'text_block_before_defline'} = {
                       'text' => 'Some text'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -173,7 +174,6 @@ $result_trees{'text_block_before_defline'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 8
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 bc455ea681..297dc74119 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -173,7 +173,8 @@ $result_trees{'between_node_and_section'} = {
       'cmdname' => 'node',
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -183,7 +184,6 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'Old-name'
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index e990cc7242..2ec595f068 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -145,7 +145,8 @@ $result_trees{'anchor_in_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -154,7 +155,8 @@ $result_trees{'anchor_in_caption'} = {
                           'text' => 'in caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -164,7 +166,6 @@ $result_trees{'anchor_in_caption'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'in-anchor'
@@ -180,7 +181,6 @@ $result_trees{'anchor_in_caption'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 6577c1f05e..fef4fcaf5a 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -145,7 +145,8 @@ $result_trees{'cindex_in_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -197,7 +198,6 @@ $result_trees{'cindex_in_caption'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -316,7 +316,7 @@ $result_trees{'cindex_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[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'}[1]{'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'}[1]{'extra'}{'float'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index b2ad1aa6da..37d088a617 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -259,12 +259,12 @@ $result_trees{'complex_float'} = {
                   'text' => 'An example of float '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -705,7 +705,8 @@ $result_trees{'complex_float'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'xref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -731,7 +732,6 @@ $result_trees{'complex_float'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'xref',
                   'source_info' => {
                     'line_nr' => 45
                   }
@@ -745,7 +745,8 @@ $result_trees{'complex_float'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -760,7 +761,6 @@ $result_trees{'complex_float'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 47
@@ -781,12 +781,12 @@ $result_trees{'complex_float'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TeX',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -795,18 +795,21 @@ $result_trees{'complex_float'} = {
                   'text' => ' and '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 't'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => '\'',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -816,17 +819,18 @@ $result_trees{'complex_float'} = {
                                       'type' => 'following_arg'
                                     }
                                   ],
-                                  'cmdname' => '\'',
                                   'source_info' => {
                                     'line_nr' => 49
                                   }
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => '^',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => 'dotless',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -836,7 +840,6 @@ $result_trees{'complex_float'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => 'dotless',
                                           'source_info' => {
                                             'line_nr' => 49
                                           }
@@ -845,7 +848,6 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '^',
                                   'source_info' => {
                                     'line_nr' => 49
                                   }
@@ -854,13 +856,13 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 49
                           }
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'url',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -870,7 +872,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'url',
                           'source_info' => {
                             'line_nr' => 49
                           }
@@ -879,7 +880,6 @@ $result_trees{'complex_float'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -888,7 +888,8 @@ $result_trees{'complex_float'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -898,7 +899,6 @@ $result_trees{'complex_float'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -907,7 +907,8 @@ $result_trees{'complex_float'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -918,7 +919,6 @@ $result_trees{'complex_float'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => '!'
                   },
@@ -951,12 +951,12 @@ $result_trees{'complex_float'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -974,7 +974,8 @@ $result_trees{'complex_float'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -983,12 +984,12 @@ $result_trees{'complex_float'} = {
                           'text' => 'An example of float caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'enddots',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'enddots',
                           'source_info' => {
                             'line_nr' => 51
                           }
@@ -1068,7 +1069,8 @@ $result_trees{'complex_float'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1078,7 +1080,6 @@ $result_trees{'complex_float'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-caption'
@@ -1599,7 +1600,8 @@ $result_trees{'complex_float'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'xref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1625,7 +1627,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'xref',
                           'source_info' => {
                             'line_nr' => 80
                           }
@@ -1639,7 +1640,8 @@ $result_trees{'complex_float'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1654,7 +1656,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 82
@@ -1675,12 +1676,12 @@ $result_trees{'complex_float'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'TeX',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'TeX',
                           'source_info' => {
                             'line_nr' => 84
                           }
@@ -1689,18 +1690,21 @@ $result_trees{'complex_float'} = {
                           'text' => ' and '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'emph',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'b',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
                                           'text' => 't'
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '\'',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -1710,17 +1714,18 @@ $result_trees{'complex_float'} = {
                                               'type' => 'following_arg'
                                             }
                                           ],
-                                          'cmdname' => '\'',
                                           'source_info' => {
                                             'line_nr' => 84
                                           }
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '^',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
-                                                  'args' => [
+                                                  'cmdname' => 'dotless',
+                                                  'contents' => [
                                                     {
                                                       'contents' => [
                                                         {
@@ -1730,7 +1735,6 @@ $result_trees{'complex_float'} = {
                                                       'type' => 
'brace_container'
                                                     }
                                                   ],
-                                                  'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'line_nr' => 84
                                                   }
@@ -1739,7 +1743,6 @@ $result_trees{'complex_float'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '^',
                                           'source_info' => {
                                             'line_nr' => 84
                                           }
@@ -1748,13 +1751,13 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'b',
                                   'source_info' => {
                                     'line_nr' => 84
                                   }
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'url',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1764,7 +1767,6 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_arg'
                                     }
                                   ],
-                                  'cmdname' => 'url',
                                   'source_info' => {
                                     'line_nr' => 84
                                   }
@@ -1773,7 +1775,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'emph',
                           'source_info' => {
                             'line_nr' => 84
                           }
@@ -1782,7 +1783,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1792,7 +1794,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 84
                           }
@@ -1801,7 +1802,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1812,7 +1814,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => '!'
                           },
@@ -1845,12 +1846,12 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'AE',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'AE',
                           'source_info' => {
                             'line_nr' => 84
                           }
@@ -1866,7 +1867,6 @@ $result_trees{'complex_float'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1890,18 +1890,19 @@ $result_trees{'complex_float'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'TeX',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'TeX',
                           'source_info' => {
                             'line_nr' => 87
                           }
@@ -1910,18 +1911,21 @@ $result_trees{'complex_float'} = {
                           'text' => ' and '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'emph',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'b',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
                                           'text' => 't'
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '\'',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -1931,17 +1935,18 @@ $result_trees{'complex_float'} = {
                                               'type' => 'following_arg'
                                             }
                                           ],
-                                          'cmdname' => '\'',
                                           'source_info' => {
                                             'line_nr' => 87
                                           }
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '^',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
-                                                  'args' => [
+                                                  'cmdname' => 'dotless',
+                                                  'contents' => [
                                                     {
                                                       'contents' => [
                                                         {
@@ -1951,7 +1956,6 @@ $result_trees{'complex_float'} = {
                                                       'type' => 
'brace_container'
                                                     }
                                                   ],
-                                                  'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'line_nr' => 87
                                                   }
@@ -1960,7 +1964,6 @@ $result_trees{'complex_float'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '^',
                                           'source_info' => {
                                             'line_nr' => 87
                                           }
@@ -1969,13 +1972,13 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'b',
                                   'source_info' => {
                                     'line_nr' => 87
                                   }
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'url',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1985,7 +1988,6 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_arg'
                                     }
                                   ],
-                                  'cmdname' => 'url',
                                   'source_info' => {
                                     'line_nr' => 87
                                   }
@@ -1994,7 +1996,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'emph',
                           'source_info' => {
                             'line_nr' => 87
                           }
@@ -2003,7 +2004,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2013,7 +2015,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 87
                           }
@@ -2022,7 +2023,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2033,7 +2035,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => '!'
                           },
@@ -2066,12 +2067,12 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'AE',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'AE',
                           'source_info' => {
                             'line_nr' => 87
                           }
@@ -2086,7 +2087,6 @@ $result_trees{'complex_float'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -2273,7 +2273,8 @@ $result_trees{'complex_float'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2282,12 +2283,12 @@ $result_trees{'complex_float'} = {
                           'text' => 'An example of float caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'enddots',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'enddots',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2862,7 +2863,8 @@ $result_trees{'complex_float'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2872,7 +2874,6 @@ $result_trees{'complex_float'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-caption-2'
@@ -2898,7 +2899,8 @@ $result_trees{'complex_float'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'xref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2924,7 +2926,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'xref',
                           'source_info' => {
                             'line_nr' => 127
                           }
@@ -2938,7 +2939,8 @@ $result_trees{'complex_float'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2953,7 +2955,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 129
@@ -2974,12 +2975,12 @@ $result_trees{'complex_float'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'TeX',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'TeX',
                           'source_info' => {
                             'line_nr' => 131
                           }
@@ -2988,18 +2989,21 @@ $result_trees{'complex_float'} = {
                           'text' => ' and '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'emph',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'b',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
                                           'text' => 't'
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '\'',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -3009,17 +3013,18 @@ $result_trees{'complex_float'} = {
                                               'type' => 'following_arg'
                                             }
                                           ],
-                                          'cmdname' => '\'',
                                           'source_info' => {
                                             'line_nr' => 131
                                           }
                                         },
                                         {
-                                          'args' => [
+                                          'cmdname' => '^',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
-                                                  'args' => [
+                                                  'cmdname' => 'dotless',
+                                                  'contents' => [
                                                     {
                                                       'contents' => [
                                                         {
@@ -3029,7 +3034,6 @@ $result_trees{'complex_float'} = {
                                                       'type' => 
'brace_container'
                                                     }
                                                   ],
-                                                  'cmdname' => 'dotless',
                                                   'source_info' => {
                                                     'line_nr' => 131
                                                   }
@@ -3038,7 +3042,6 @@ $result_trees{'complex_float'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '^',
                                           'source_info' => {
                                             'line_nr' => 131
                                           }
@@ -3047,13 +3050,13 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'b',
                                   'source_info' => {
                                     'line_nr' => 131
                                   }
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'url',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -3063,7 +3066,6 @@ $result_trees{'complex_float'} = {
                                       'type' => 'brace_arg'
                                     }
                                   ],
-                                  'cmdname' => 'url',
                                   'source_info' => {
                                     'line_nr' => 131
                                   }
@@ -3072,7 +3074,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'emph',
                           'source_info' => {
                             'line_nr' => 131
                           }
@@ -3081,7 +3082,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3091,7 +3093,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 131
                           }
@@ -3100,7 +3101,8 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3111,7 +3113,6 @@ $result_trees{'complex_float'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => '!'
                           },
@@ -3144,12 +3145,12 @@ $result_trees{'complex_float'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'AE',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'AE',
                           'source_info' => {
                             'line_nr' => 131
                           }
@@ -3165,7 +3166,6 @@ $result_trees{'complex_float'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -3243,7 +3243,8 @@ $result_trees{'complex_float'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3261,7 +3262,6 @@ $result_trees{'complex_float'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 136
               }
@@ -3298,24 +3298,24 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'con
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'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'}[16];
 
$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'}[19];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'complex_float'} = '@node Top
 @top Test floats
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 3239012408..1f35c949d3 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -52,12 +52,12 @@ $result_trees{'empty_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -156,12 +156,12 @@ $result_trees{'empty_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -249,12 +249,12 @@ $result_trees{'empty_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -268,12 +268,12 @@ $result_trees{'empty_caption'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 44fa982a8d..475fc8d03f 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -141,7 +141,8 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -310,7 +310,8 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -325,7 +326,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index ecc5b765a3..d7617f2743 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -84,7 +84,8 @@ $result_trees{'float_copying'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'caption',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -93,7 +94,8 @@ $result_trees{'float_copying'} = {
                                   'text' => 'The Public Domain notice'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'footnote',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -103,7 +105,8 @@ $result_trees{'float_copying'} = {
 '
                                             },
                                             {
-                                              'args' => [
+                                              'cmdname' => 'anchor',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -116,7 +119,6 @@ $result_trees{'float_copying'} = {
                                                   'type' => 'brace_arg'
                                                 }
                                               ],
-                                              'cmdname' => 'anchor',
                                               'extra' => {
                                                 'is_target' => 1,
                                                 'normalized' => 
'caption-copying-footnote-anchor'
@@ -221,7 +223,8 @@ $result_trees{'float_copying'} = {
                                               'text' => 'see '
                                             },
                                             {
-                                              'args' => [
+                                              'cmdname' => 'ref',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -239,7 +242,6 @@ $result_trees{'float_copying'} = {
                                                   'type' => 'brace_arg'
                                                 }
                                               ],
-                                              'cmdname' => 'ref',
                                               'source_info' => {
                                                 'line_nr' => 15
                                               }
@@ -260,7 +262,6 @@ $result_trees{'float_copying'} = {
                                       'type' => 'brace_command_context'
                                     }
                                   ],
-                                  'cmdname' => 'footnote',
                                   'extra' => {},
                                   'info' => {
                                     'spaces_before_argument' => {
@@ -285,7 +286,8 @@ $result_trees{'float_copying'} = {
                               'type' => 'empty_line'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -298,7 +300,6 @@ $result_trees{'float_copying'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'public-domain-anchor'
@@ -388,7 +389,6 @@ $result_trees{'float_copying'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'caption',
                       'extra' => {
                         'float' => {}
                       },
@@ -882,7 +882,7 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'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'}[1]{'contents'}[3]{'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'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/float/float_in_block_commands.pl 
b/tp/t/results/float/float_in_block_commands.pl
index bb66a44b99..45be06670e 100644
--- a/tp/t/results/float/float_in_block_commands.pl
+++ b/tp/t/results/float/float_in_block_commands.pl
@@ -57,7 +57,8 @@ $result_trees{'float_in_block_commands'} = {
               'cmdname' => 'float',
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -72,7 +73,6 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
@@ -224,7 +224,8 @@ $result_trees{'float_in_block_commands'} = {
               'cmdname' => 'float',
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -239,7 +240,6 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
@@ -383,7 +383,8 @@ $result_trees{'float_in_block_commands'} = {
               'cmdname' => 'float',
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -398,7 +399,6 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
diff --git a/tp/t/results/float/float_type_with_tieaccent.pl 
b/tp/t/results/float/float_type_with_tieaccent.pl
index 6a00a12344..a58cb70834 100644
--- a/tp/t/results/float/float_type_with_tieaccent.pl
+++ b/tp/t/results/float/float_type_with_tieaccent.pl
@@ -20,7 +20,8 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => 'A '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -30,7 +31,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -39,7 +39,8 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -49,7 +50,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -58,11 +58,13 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -72,7 +74,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 1
                           }
@@ -84,7 +85,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -179,7 +179,8 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => 'A '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -189,7 +190,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -198,7 +198,8 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -217,11 +217,13 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -231,7 +233,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 5
                           }
@@ -243,7 +244,6 @@ $result_trees{'float_type_with_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 5
                   }
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index 8409153305..477d5573bf 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -20,7 +20,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'entr'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -30,7 +31,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -47,7 +47,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'premi'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -57,7 +58,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -66,7 +66,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 're entr'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -76,7 +77,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -110,7 +110,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'Ceci est notre premi'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -120,7 +121,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 3
                   }
@@ -129,7 +129,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 're entr'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -139,7 +140,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 3
                   }
@@ -152,7 +152,8 @@ $result_trees{'float_with_at_commands'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -161,7 +162,8 @@ $result_trees{'float_with_at_commands'} = {
                           'text' => 'La premi'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -171,7 +173,6 @@ $result_trees{'float_with_at_commands'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -180,7 +181,8 @@ $result_trees{'float_with_at_commands'} = {
                           'text' => 're entr'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -190,7 +192,6 @@ $result_trees{'float_with_at_commands'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -205,7 +206,6 @@ $result_trees{'float_with_at_commands'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -287,7 +287,8 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'entr'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -297,7 +298,6 @@ $result_trees{'float_with_at_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 9
                   }
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 6994e87b65..e95ef4f498 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -145,7 +145,8 @@ $result_trees{'footnote_in_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -154,7 +155,8 @@ $result_trees{'footnote_in_caption'} = {
                           'text' => 'in caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -169,7 +171,6 @@ $result_trees{'footnote_in_caption'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 8
@@ -182,7 +183,6 @@ $result_trees{'footnote_in_caption'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 99211d40b7..f37f5fa0bf 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -145,7 +145,8 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -154,7 +155,8 @@ $result_trees{'footnote_in_caption_and_error'} = {
                           'text' => 'in caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -175,7 +177,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 8
@@ -188,7 +189,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/float/listoffloats_with_commands.pl 
b/tp/t/results/float/listoffloats_with_commands.pl
index e35931ec39..97a8c40c94 100644
--- a/tp/t/results/float/listoffloats_with_commands.pl
+++ b/tp/t/results/float/listoffloats_with_commands.pl
@@ -20,7 +20,8 @@ $result_trees{'listoffloats_with_commands'} = {
                   'text' => 'th'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -30,7 +31,6 @@ $result_trees{'listoffloats_with_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -39,7 +39,8 @@ $result_trees{'listoffloats_with_commands'} = {
                   'text' => 'or'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -49,7 +50,6 @@ $result_trees{'listoffloats_with_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 03fcf923f0..fd300012bf 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -106,7 +106,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -115,12 +116,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'text' => 'An example of float caption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'enddots',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'enddots',
                           'source_info' => {
                             'line_nr' => 6
                           }
@@ -132,7 +133,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -151,18 +151,19 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'TeX',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'TeX',
                           'source_info' => {
                             'line_nr' => 7
                           }
@@ -177,7 +178,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -277,7 +277,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -292,7 +293,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -306,7 +306,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -321,7 +322,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -422,7 +422,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -451,7 +451,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -466,7 +467,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -725,7 +725,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -740,7 +741,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -754,7 +754,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -769,7 +770,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -865,7 +865,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -880,7 +881,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -894,7 +894,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -909,7 +910,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -1020,7 +1020,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1035,7 +1036,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1049,7 +1049,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1064,7 +1065,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -1525,7 +1525,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1540,7 +1541,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1636,7 +1636,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'cmdname' => 'float',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1645,12 +1646,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'text' => 'An example of float caption, no 
shortcaption'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'enddots',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'enddots',
                           'source_info' => {
                             'line_nr' => 74
                           }
@@ -1662,7 +1663,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -1740,7 +1740,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'th'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1750,7 +1751,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 77
                   }
@@ -1759,7 +1759,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'or'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1769,7 +1770,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 77
                   }
@@ -1806,7 +1806,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'A th'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1816,7 +1817,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 78
                   }
@@ -1825,7 +1825,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'or'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1835,7 +1836,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 78
                   }
@@ -1853,7 +1853,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1862,7 +1863,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'text' => 'C A th'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1872,7 +1874,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'line_nr' => 80
                           }
@@ -1881,7 +1882,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                           'text' => 'or'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1891,7 +1893,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'line_nr' => 80
                           }
@@ -1906,7 +1907,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -2008,7 +2008,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2023,7 +2024,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -2037,7 +2037,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2052,7 +2053,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -2163,7 +2163,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2178,7 +2179,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -2192,7 +2192,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2207,7 +2208,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -2744,7 +2744,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2759,7 +2760,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -2773,7 +2773,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2788,7 +2789,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -2886,7 +2886,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2901,7 +2902,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -2915,7 +2915,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -2930,7 +2931,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -3112,7 +3112,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3127,7 +3128,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -3141,7 +3141,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3156,7 +3157,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -3423,7 +3423,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3438,7 +3439,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -3452,7 +3452,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3467,7 +3468,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -3641,7 +3641,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3656,7 +3657,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -3670,7 +3670,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3685,7 +3686,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -3788,7 +3788,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3803,7 +3804,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -3817,7 +3817,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3832,7 +3833,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -4009,7 +4009,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4024,7 +4025,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -4038,7 +4038,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4053,7 +4054,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -4193,7 +4193,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'See '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4211,7 +4212,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 180
               }
@@ -4224,7 +4224,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'And ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4242,7 +4243,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 181
               }
@@ -4252,7 +4252,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4270,7 +4271,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 182
               }
@@ -4294,7 +4294,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4338,7 +4339,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 185
               }
@@ -4362,7 +4362,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4418,7 +4419,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 188
               }
@@ -4442,7 +4442,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4501,7 +4502,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 191
               }
@@ -4524,7 +4524,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'A ref to float without type '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -4542,7 +4543,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 193
               }
@@ -4597,7 +4597,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'th'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -4607,7 +4608,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 196
                   }
@@ -4616,7 +4616,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'or'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '`',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -4626,7 +4627,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '`',
                   'source_info' => {
                     'line_nr' => 196
                   }
@@ -4796,13 +4796,13 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_texis{'numbering_captions_listoffloats'} = '@node Top
 @top Test floats
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index ec0c6ca686..98ccc494c9 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -188,7 +188,8 @@ $result_trees{'ref_to_float'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -206,7 +207,6 @@ $result_trees{'ref_to_float'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -226,7 +226,8 @@ $result_trees{'ref_to_float'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -244,7 +245,6 @@ $result_trees{'ref_to_float'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -262,8 +262,8 @@ $result_trees{'ref_to_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_to_float'} = '@float Text, Label1
 Float
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 6970db8183..9a0b5bd7fe 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -57,7 +57,8 @@ $result_trees{'simple'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -72,7 +73,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
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 212b920188..69c3fdc19d 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -150,7 +150,8 @@ $result_trees{'special_characters_in_float_type'} = {
                   'text' => ' --- '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -160,7 +161,6 @@ $result_trees{'special_characters_in_float_type'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -180,7 +180,8 @@ $result_trees{'special_characters_in_float_type'} = {
                   'text' => ' --- '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -190,7 +191,6 @@ $result_trees{'special_characters_in_float_type'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -220,7 +220,8 @@ $result_trees{'special_characters_in_float_type'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -235,7 +236,8 @@ $result_trees{'special_characters_in_float_type'} = {
                           'text' => ' --- '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -245,7 +247,6 @@ $result_trees{'special_characters_in_float_type'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 9
                           }
@@ -257,7 +258,6 @@ $result_trees{'special_characters_in_float_type'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -336,7 +336,8 @@ $result_trees{'special_characters_in_float_type'} = {
                   'text' => ' --- '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -346,7 +347,6 @@ $result_trees{'special_characters_in_float_type'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 12
                   }
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 5bb0abe6ee..8bf3f8a83d 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -76,7 +76,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -95,7 +95,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -105,7 +106,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -128,7 +128,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -138,7 +139,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -147,7 +147,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -157,7 +158,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -180,7 +180,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -190,7 +191,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -199,7 +199,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -209,7 +210,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -232,7 +232,8 @@ $result_trees{'accent'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -242,7 +243,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -251,7 +251,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -261,7 +262,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -284,7 +284,8 @@ $result_trees{'accent'} = {
               'text' => 'should be i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -303,7 +303,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -313,7 +314,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -336,7 +336,8 @@ $result_trees{'accent'} = {
               'text' => 'should be i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -346,7 +347,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -355,7 +355,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -365,7 +366,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -388,7 +388,8 @@ $result_trees{'accent'} = {
               'text' => 'should be i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -398,7 +399,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -407,7 +407,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -417,7 +418,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -440,7 +440,8 @@ $result_trees{'accent'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -450,7 +451,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -459,7 +459,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -469,7 +470,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -492,7 +492,8 @@ $result_trees{'accent'} = {
               'text' => 'should be c,: '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -502,7 +503,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -511,7 +511,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -544,7 +544,8 @@ $result_trees{'accent'} = {
               'text' => 'should be n~: '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -554,7 +555,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -563,7 +563,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -573,7 +574,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -596,7 +596,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e=: '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -606,7 +607,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -615,7 +615,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -625,7 +626,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -648,7 +648,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -658,7 +659,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -667,7 +667,8 @@ $result_trees{'accent'} = {
               'text' => '\': '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -677,7 +678,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -686,7 +686,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -696,7 +697,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'H',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -724,7 +724,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e.: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -743,7 +743,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -753,7 +754,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -781,7 +781,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e*: '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -791,7 +792,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -800,7 +800,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -810,7 +811,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -838,7 +838,8 @@ $result_trees{'accent'} = {
               'text' => 'should be ee[: '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -848,7 +849,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -871,7 +871,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e(: '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -890,7 +890,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -900,7 +901,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'u',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -928,7 +928,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e_: '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -938,7 +939,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -947,7 +947,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -957,7 +958,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -985,7 +985,8 @@ $result_trees{'accent'} = {
               'text' => 'should be .e: '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -995,7 +996,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -1004,7 +1004,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1014,7 +1015,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1042,7 +1042,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e<: '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1052,7 +1053,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -1061,7 +1061,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1071,7 +1072,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'v',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1099,7 +1099,8 @@ $result_trees{'accent'} = {
               'text' => 'should be a; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1109,7 +1110,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 42
               }
@@ -1118,7 +1118,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1128,7 +1129,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1156,7 +1156,8 @@ $result_trees{'accent'} = {
               'text' => 'should be e; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1166,7 +1167,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -1175,7 +1175,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1185,7 +1186,6 @@ $result_trees{'accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1213,12 +1213,12 @@ $result_trees{'accent'} = {
               'text' => 'upside down: '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1227,12 +1227,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1255,12 +1255,12 @@ $result_trees{'accent'} = {
               'text' => 'A-with-circle: '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1269,12 +1269,12 @@ $result_trees{'accent'} = {
               'text' => ','
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1297,12 +1297,12 @@ $result_trees{'accent'} = {
               'text' => 'AE, OE ligatures: '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1311,12 +1311,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1325,12 +1325,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1339,12 +1339,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1367,7 +1367,8 @@ $result_trees{'accent'} = {
               'text' => 'dotless i, j: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1377,7 +1378,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1386,7 +1386,8 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1396,7 +1397,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1419,12 +1419,12 @@ $result_trees{'accent'} = {
               'text' => 'Polish suppressed-L: '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1433,12 +1433,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1461,12 +1461,12 @@ $result_trees{'accent'} = {
               'text' => 'O-with-slash: '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1475,12 +1475,12 @@ $result_trees{'accent'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1503,12 +1503,12 @@ $result_trees{'accent'} = {
               'text' => 'es-zet or sharp S: '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1531,12 +1531,12 @@ $result_trees{'accent'} = {
               'text' => 'pounds sterling: '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 60
               }
@@ -1569,11 +1569,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1583,7 +1585,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 63
                       }
@@ -1592,7 +1593,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 63
               }
@@ -1615,11 +1615,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1629,7 +1631,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -1638,7 +1639,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -1661,11 +1661,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1675,7 +1677,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -1684,7 +1685,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -1707,11 +1707,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless i": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1721,7 +1723,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 69
                       }
@@ -1730,7 +1731,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 69
               }
@@ -1763,11 +1763,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless j`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1777,7 +1779,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 72
                       }
@@ -1786,7 +1787,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 72
               }
@@ -1809,11 +1809,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless j\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1823,7 +1825,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 74
                       }
@@ -1832,7 +1833,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -1855,11 +1855,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless j^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1869,7 +1871,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 76
                       }
@@ -1878,7 +1879,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -1901,11 +1901,13 @@ $result_trees{'accent'} = {
               'text' => 'should be dotless j": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1915,7 +1917,6 @@ $result_trees{'accent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 78
                       }
@@ -1924,7 +1925,6 @@ $result_trees{'accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 78
               }
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 6c9392dbea..dc7be39711 100644
--- a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -134,7 +134,8 @@ $result_trees{'accent_argument_non_ascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,6 @@ $result_trees{'accent_argument_non_ascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -154,7 +154,8 @@ $result_trees{'accent_argument_non_ascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'accent_argument_non_ascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 7
               }
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 249398b188..43bf3d9429 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -76,7 +76,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -95,7 +95,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -105,7 +106,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -128,7 +128,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -138,7 +139,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -147,7 +147,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -157,7 +158,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -180,7 +180,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -190,7 +191,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -199,7 +199,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -209,7 +210,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -232,7 +232,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -242,7 +243,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -251,7 +251,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -261,7 +262,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -284,7 +284,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -303,7 +303,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -313,7 +314,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -336,7 +336,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -346,7 +347,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -355,7 +355,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -365,7 +366,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -388,7 +388,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -398,7 +399,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -407,7 +407,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -417,7 +418,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -440,7 +440,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -450,7 +451,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -459,7 +459,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -469,7 +470,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -492,7 +492,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be c,: '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -502,7 +503,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -511,7 +511,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -544,7 +544,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be n~: '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -554,7 +555,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -563,7 +563,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -573,7 +574,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -596,7 +596,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e=: '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -606,7 +607,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -615,7 +615,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -625,7 +626,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -648,7 +648,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -658,7 +659,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -667,7 +667,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => '\': '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -677,7 +678,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -686,7 +686,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -696,7 +697,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'H',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -724,7 +724,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e.: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -743,7 +743,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -753,7 +754,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -781,7 +781,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e*: '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -791,7 +792,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -800,7 +800,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -810,7 +811,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -838,7 +838,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be ee[: '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -848,7 +849,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -871,7 +871,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e(: '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -890,7 +890,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -900,7 +901,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'u',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -928,7 +928,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e_: '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -938,7 +939,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -947,7 +947,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -957,7 +958,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -985,7 +985,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be .e: '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -995,7 +996,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -1004,7 +1004,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1014,7 +1015,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1042,7 +1042,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e<: '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1052,7 +1053,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -1061,7 +1061,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1071,7 +1072,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'v',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1099,7 +1099,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be a; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1109,7 +1110,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 42
               }
@@ -1118,7 +1118,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1128,7 +1129,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1156,7 +1156,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be e; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1166,7 +1167,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -1175,7 +1175,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1185,7 +1186,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1213,12 +1213,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'upside down: '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1227,12 +1227,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1255,12 +1255,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'A-with-circle: '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1269,12 +1269,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ','
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1297,12 +1297,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'AE, OE ligatures: '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1311,12 +1311,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1325,12 +1325,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1339,12 +1339,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1367,7 +1367,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'dotless i, j: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1377,7 +1378,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1386,7 +1386,8 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1396,7 +1397,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1419,12 +1419,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'Polish suppressed-L: '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1433,12 +1433,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1461,12 +1461,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'O-with-slash: '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1475,12 +1475,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1503,12 +1503,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'es-zet or sharp S: '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1531,12 +1531,12 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'pounds sterling: '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 60
               }
@@ -1569,11 +1569,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1583,7 +1585,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 63
                       }
@@ -1592,7 +1593,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 63
               }
@@ -1615,11 +1615,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1629,7 +1631,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -1638,7 +1639,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -1661,11 +1661,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1675,7 +1677,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -1684,7 +1685,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -1707,11 +1707,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless i": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1721,7 +1723,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 69
                       }
@@ -1730,7 +1731,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 69
               }
@@ -1763,11 +1763,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless j`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1777,7 +1779,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 72
                       }
@@ -1786,7 +1787,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 72
               }
@@ -1809,11 +1809,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless j\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1823,7 +1825,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 74
                       }
@@ -1832,7 +1833,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -1855,11 +1855,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless j^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1869,7 +1871,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 76
                       }
@@ -1878,7 +1879,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -1901,11 +1901,13 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'should be dotless j": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1915,7 +1917,6 @@ $result_trees{'accent_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 78
                       }
@@ -1924,7 +1925,6 @@ $result_trees{'accent_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 78
               }
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 322dfd02ce..9e1421d9bc 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -114,7 +114,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -124,7 +125,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -133,7 +133,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -143,7 +144,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -166,7 +166,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -176,7 +177,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -185,7 +185,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -195,7 +196,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -218,7 +218,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -228,7 +229,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -237,7 +237,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -247,7 +248,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -270,7 +270,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -289,7 +289,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -299,7 +300,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -322,7 +322,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -332,7 +333,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -341,7 +341,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -351,7 +352,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -374,7 +374,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -384,7 +385,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -393,7 +393,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -403,7 +404,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -426,7 +426,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -436,7 +437,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -445,7 +445,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -455,7 +456,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -478,7 +478,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -488,7 +489,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -497,7 +497,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -507,7 +508,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -530,7 +530,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be c,: '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -549,7 +549,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -559,7 +560,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -582,7 +582,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be n~: '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -592,7 +593,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -601,7 +601,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -611,7 +612,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -634,7 +634,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e=: '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -644,7 +645,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -653,7 +653,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -663,7 +664,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -686,7 +686,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -696,7 +697,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -705,7 +705,8 @@ $result_trees{'accentenc'} = {
               'text' => '\': '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -715,7 +716,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -724,7 +724,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'H',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -762,7 +762,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e.: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -772,7 +773,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -781,7 +781,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -791,7 +792,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -819,7 +819,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e*: '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -829,7 +830,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -838,7 +838,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -848,7 +849,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -876,7 +876,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be ee[: '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -886,7 +887,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -909,7 +909,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e(: '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -919,7 +920,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -928,7 +928,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -938,7 +939,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'u',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -966,7 +966,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e_: '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -976,7 +977,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -985,7 +985,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -995,7 +996,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1023,7 +1023,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be .e: '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1033,7 +1034,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -1042,7 +1042,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1052,7 +1053,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1080,7 +1080,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e<: '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1090,7 +1091,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 42
               }
@@ -1099,7 +1099,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1109,7 +1110,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'v',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1137,7 +1137,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be a; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1147,7 +1148,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -1156,7 +1156,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1166,7 +1167,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1194,7 +1194,8 @@ $result_trees{'accentenc'} = {
               'text' => 'should be e; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1204,7 +1205,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1213,7 +1213,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1223,7 +1224,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1251,12 +1251,12 @@ $result_trees{'accentenc'} = {
               'text' => 'upside down: '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1265,12 +1265,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1293,12 +1293,12 @@ $result_trees{'accentenc'} = {
               'text' => 'A-with-circle: '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1307,12 +1307,12 @@ $result_trees{'accentenc'} = {
               'text' => ','
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1335,12 +1335,12 @@ $result_trees{'accentenc'} = {
               'text' => 'AE, OE ligatures: '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1349,12 +1349,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1363,12 +1363,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1377,12 +1377,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1405,7 +1405,8 @@ $result_trees{'accentenc'} = {
               'text' => 'dotless i, j: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1415,7 +1416,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1424,7 +1424,8 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1434,7 +1435,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1457,12 +1457,12 @@ $result_trees{'accentenc'} = {
               'text' => 'Polish suppressed-L: '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1471,12 +1471,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1499,12 +1499,12 @@ $result_trees{'accentenc'} = {
               'text' => 'O-with-slash: '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1513,12 +1513,12 @@ $result_trees{'accentenc'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1541,12 +1541,12 @@ $result_trees{'accentenc'} = {
               'text' => 'es-zet or sharp S: '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 60
               }
@@ -1569,12 +1569,12 @@ $result_trees{'accentenc'} = {
               'text' => 'pounds sterling: '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -1607,11 +1607,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1621,7 +1623,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -1630,7 +1631,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -1653,11 +1653,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1667,7 +1669,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -1676,7 +1677,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -1699,11 +1699,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1713,7 +1715,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 69
                       }
@@ -1722,7 +1723,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 69
               }
@@ -1745,11 +1745,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless i": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1759,7 +1761,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -1768,7 +1769,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -1801,11 +1801,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless j`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1815,7 +1817,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 74
                       }
@@ -1824,7 +1825,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -1847,11 +1847,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless j\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1861,7 +1863,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 76
                       }
@@ -1870,7 +1871,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -1893,11 +1893,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless j^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1907,7 +1909,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 78
                       }
@@ -1916,7 +1917,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 78
               }
@@ -1939,11 +1939,13 @@ $result_trees{'accentenc'} = {
               'text' => 'should be dotless j": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1953,7 +1955,6 @@ $result_trees{'accentenc'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 80
                       }
@@ -1962,7 +1963,6 @@ $result_trees{'accentenc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 80
               }
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 10a2395f04..b3dcfbfb7a 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -109,7 +109,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -119,7 +120,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -128,7 +128,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -138,7 +139,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -161,7 +161,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -171,7 +172,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -180,7 +180,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -190,7 +191,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -213,7 +213,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -223,7 +224,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -232,7 +232,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -242,7 +243,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -265,7 +265,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -275,7 +276,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -284,7 +284,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -317,7 +317,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -327,7 +328,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -336,7 +336,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -346,7 +347,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -369,7 +369,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -379,7 +380,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -388,7 +388,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -398,7 +399,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -421,7 +421,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -431,7 +432,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -440,7 +440,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -450,7 +451,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -473,7 +473,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be u": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -483,7 +484,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -492,7 +492,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -502,7 +503,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -525,7 +525,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be c,: '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -535,7 +536,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -544,7 +544,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -554,7 +555,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -577,7 +577,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be n~: '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -587,7 +588,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -596,7 +596,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -606,7 +607,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -629,7 +629,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e=: '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -639,7 +640,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -648,7 +648,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -658,7 +659,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -681,7 +681,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e'
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -700,7 +700,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => '\': '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -710,7 +711,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -719,7 +719,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -729,7 +730,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'H',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -757,7 +757,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e.: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -767,7 +768,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -776,7 +776,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -786,7 +787,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -814,7 +814,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e*: '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -824,7 +825,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -833,7 +833,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -843,7 +844,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -871,7 +871,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be ee[: '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -904,7 +904,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e(: '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -914,7 +915,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -923,7 +923,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -933,7 +934,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'u',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -961,7 +961,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e_: '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -971,7 +972,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 38
               }
@@ -980,7 +980,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -990,7 +991,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1018,7 +1018,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be .e: '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1028,7 +1029,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -1037,7 +1037,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1047,7 +1048,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1075,7 +1075,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e<: '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1085,7 +1086,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 42
               }
@@ -1094,7 +1094,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1104,7 +1105,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'v',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1132,7 +1132,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be a; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1142,7 +1143,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -1151,7 +1151,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1161,7 +1162,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1189,7 +1189,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be e; : '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -1208,7 +1208,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1218,7 +1219,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ogonek',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
@@ -1246,12 +1246,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'upside down: '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1260,12 +1260,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 48
               }
@@ -1288,12 +1288,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'A-with-circle: '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1302,12 +1302,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ','
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -1330,12 +1330,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'AE, OE ligatures: '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1344,12 +1344,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1358,12 +1358,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1372,12 +1372,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -1400,7 +1400,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'dotless i, j: '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1410,7 +1411,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1419,7 +1419,8 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1429,7 +1430,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1452,12 +1452,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'Polish suppressed-L: '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1466,12 +1466,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1494,12 +1494,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'O-with-slash: '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1508,12 +1508,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -1536,12 +1536,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'es-zet or sharp S: '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 60
               }
@@ -1564,12 +1564,12 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'pounds sterling: '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -1602,11 +1602,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless i`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1616,7 +1618,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -1625,7 +1626,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -1648,11 +1648,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless i\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1662,7 +1664,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -1671,7 +1672,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -1694,11 +1694,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless i^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1708,7 +1710,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 69
                       }
@@ -1717,7 +1718,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 69
               }
@@ -1740,11 +1740,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless i": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1754,7 +1756,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -1763,7 +1764,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -1796,11 +1796,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless j`: '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1810,7 +1812,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 74
                       }
@@ -1819,7 +1820,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -1842,11 +1842,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless j\': '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1856,7 +1858,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 76
                       }
@@ -1865,7 +1866,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -1888,11 +1888,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless j^: '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1902,7 +1904,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 78
                       }
@@ -1911,7 +1912,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 78
               }
@@ -1934,11 +1934,13 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'should be dotless j": '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1948,7 +1950,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 80
                       }
@@ -1957,7 +1958,6 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 80
               }
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 3442e60e04..7a683080fd 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -265,12 +265,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -279,12 +279,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -293,12 +293,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -307,12 +307,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -321,12 +321,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -383,12 +383,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -397,12 +397,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -411,12 +411,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -425,12 +425,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -439,12 +439,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -453,12 +453,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -467,12 +467,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -533,12 +533,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -547,12 +547,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -561,12 +561,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -575,12 +575,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -589,12 +589,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -603,12 +603,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -667,12 +667,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -681,12 +681,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -695,12 +695,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -753,12 +753,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -767,12 +767,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -781,12 +781,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -795,12 +795,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -809,12 +809,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -823,12 +823,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -837,12 +837,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -903,12 +903,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -917,12 +917,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -931,12 +931,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -945,12 +945,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -959,12 +959,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -1021,12 +1021,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1035,12 +1035,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1049,12 +1049,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1063,12 +1063,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1077,12 +1077,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1091,12 +1091,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1105,12 +1105,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1119,12 +1119,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1133,12 +1133,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1147,12 +1147,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1161,12 +1161,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1175,12 +1175,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1189,12 +1189,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1203,12 +1203,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -1283,7 +1283,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1293,7 +1294,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1302,7 +1302,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1312,7 +1313,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1321,11 +1321,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1335,7 +1337,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -1344,7 +1345,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1353,7 +1353,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1363,7 +1364,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1372,7 +1372,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1382,7 +1383,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1391,7 +1391,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1401,7 +1402,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1410,7 +1410,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1420,7 +1421,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1429,7 +1429,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1439,7 +1440,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1448,7 +1448,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1458,7 +1459,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1467,7 +1467,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1477,7 +1478,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1486,7 +1486,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1496,7 +1497,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -1565,7 +1565,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1575,7 +1576,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1584,7 +1584,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1594,7 +1595,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1603,7 +1603,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1613,7 +1614,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1622,7 +1622,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1632,7 +1633,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1641,7 +1641,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1651,7 +1652,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1660,7 +1660,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1670,7 +1671,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1679,7 +1679,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1689,7 +1690,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1750,7 +1750,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1760,7 +1761,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1769,11 +1769,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1783,7 +1785,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1792,7 +1793,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1801,11 +1801,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1815,7 +1817,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 16
                               }
@@ -1824,7 +1825,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1877,12 +1877,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1891,12 +1891,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1905,12 +1905,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1919,12 +1919,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1933,12 +1933,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1947,12 +1947,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -2011,12 +2011,12 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2025,12 +2025,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2039,12 +2039,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2053,12 +2053,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2067,12 +2067,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2081,12 +2081,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -2191,7 +2191,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2214,7 +2215,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2223,7 +2223,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2233,7 +2234,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2242,7 +2242,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2252,7 +2253,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2305,8 +2305,9 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
-                        {
+                      'cmdname' => 'abbr',
+                      'contents' => [
+                        {
                           'contents' => [
                             {
                               'text' => 'CCC'
@@ -2328,7 +2329,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2337,7 +2337,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2347,7 +2348,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2356,7 +2356,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2366,7 +2367,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2419,7 +2419,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2448,7 +2449,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 22
                       }
@@ -2457,7 +2457,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2473,7 +2474,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 22
                       }
@@ -2524,7 +2524,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2534,7 +2535,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -2546,7 +2546,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2588,7 +2589,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -2642,7 +2642,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2653,7 +2654,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -2705,14 +2705,16 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2722,7 +2724,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 25
                               }
@@ -2731,7 +2732,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2740,7 +2740,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2753,7 +2754,8 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2763,7 +2765,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 25
                               }
@@ -2772,7 +2773,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2781,7 +2781,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2791,7 +2792,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2800,7 +2800,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2810,7 +2811,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2819,7 +2819,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2829,7 +2830,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2838,7 +2838,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2848,7 +2849,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2857,7 +2857,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2867,7 +2868,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2876,7 +2876,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2886,7 +2887,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2895,7 +2895,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2905,7 +2906,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2970,7 +2970,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2980,7 +2981,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -2989,7 +2989,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2999,7 +3000,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3008,7 +3008,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3018,7 +3019,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3027,7 +3027,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3037,7 +3038,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3046,7 +3046,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3056,7 +3057,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3065,7 +3065,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3075,7 +3076,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3084,14 +3084,16 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3101,7 +3103,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 26
                               }
@@ -3110,7 +3111,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 26
                       }
@@ -3174,7 +3174,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3184,7 +3185,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 27
                       }
@@ -3234,7 +3234,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3244,7 +3245,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -3253,7 +3253,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3263,7 +3264,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -3314,7 +3314,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3324,7 +3325,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3373,7 +3373,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3383,7 +3384,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 30
                       }
@@ -3392,7 +3392,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3402,7 +3403,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 30
                       }
@@ -3453,7 +3453,8 @@ $result_trees{'at_commands_in_refs'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3463,7 +3464,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3472,7 +3472,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3495,7 +3496,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3504,7 +3504,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3525,7 +3526,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3881,12 +3881,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -3895,12 +3895,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -3909,12 +3909,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -3923,12 +3923,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -3937,12 +3937,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -3976,12 +3976,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -3990,12 +3990,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -4004,12 +4004,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -4018,12 +4018,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -4032,12 +4032,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -4077,12 +4077,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4091,12 +4091,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4105,12 +4105,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4119,12 +4119,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4133,12 +4133,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4147,12 +4147,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4161,12 +4161,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4200,12 +4200,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4214,12 +4214,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4228,12 +4228,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4242,12 +4242,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4256,12 +4256,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4270,12 +4270,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4284,12 +4284,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4329,12 +4329,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4343,12 +4343,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4357,12 +4357,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4371,12 +4371,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4385,12 +4385,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4399,12 +4399,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4438,12 +4438,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4452,12 +4452,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4466,12 +4466,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4480,12 +4480,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4494,12 +4494,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4508,12 +4508,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4553,12 +4553,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4567,12 +4567,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
-                {
+              'cmdname' => 'leq',
+              'contents' => [
+                {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4581,12 +4581,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4620,12 +4620,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4634,12 +4634,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'leq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4648,12 +4648,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4693,12 +4693,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4707,12 +4707,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4721,12 +4721,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4735,12 +4735,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4749,12 +4749,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4763,12 +4763,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4777,12 +4777,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4816,12 +4816,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4830,12 +4830,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4844,12 +4844,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4858,12 +4858,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4872,12 +4872,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4886,12 +4886,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4900,12 +4900,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4945,12 +4945,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4959,12 +4959,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4973,12 +4973,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4987,12 +4987,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -5001,12 +5001,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -5040,12 +5040,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5054,12 +5054,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5068,12 +5068,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5082,12 +5082,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5096,12 +5096,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5141,12 +5141,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5155,12 +5155,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5169,12 +5169,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5183,12 +5183,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5197,12 +5197,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5211,12 +5211,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5225,12 +5225,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5239,12 +5239,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5253,12 +5253,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5267,12 +5267,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5281,12 +5281,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5295,12 +5295,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5309,12 +5309,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5323,12 +5323,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5362,12 +5362,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5376,12 +5376,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5390,12 +5390,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5404,12 +5404,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5418,12 +5418,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5432,12 +5432,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5446,12 +5446,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5460,12 +5460,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5474,12 +5474,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5488,12 +5488,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5502,12 +5502,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5516,12 +5516,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5530,12 +5530,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5544,12 +5544,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5589,7 +5589,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5599,7 +5600,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5608,7 +5608,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5618,7 +5619,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5627,11 +5627,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5641,7 +5643,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 61
                       }
@@ -5650,7 +5651,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5659,7 +5659,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5669,7 +5670,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5678,7 +5678,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5688,7 +5689,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5697,7 +5697,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5707,7 +5708,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5716,7 +5716,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5726,7 +5727,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5735,7 +5735,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5745,7 +5746,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5754,7 +5754,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5764,7 +5765,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5773,7 +5773,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5783,7 +5784,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5792,7 +5792,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5802,7 +5803,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5836,7 +5836,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5846,7 +5847,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5855,7 +5855,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5865,7 +5866,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5874,11 +5874,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5888,7 +5890,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 62
                       }
@@ -5897,7 +5898,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5906,7 +5906,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5916,7 +5917,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5925,7 +5925,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5935,7 +5936,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5944,7 +5944,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5954,7 +5955,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5963,7 +5963,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5973,7 +5974,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5982,7 +5982,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5992,7 +5993,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -6001,7 +6001,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6011,7 +6012,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -6020,7 +6020,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6030,7 +6031,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -6039,7 +6039,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6049,7 +6050,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -6089,7 +6089,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6099,7 +6100,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6108,7 +6108,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6118,7 +6119,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6127,7 +6127,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6137,7 +6138,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6146,7 +6146,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6156,7 +6157,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6165,7 +6165,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6175,7 +6176,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6184,7 +6184,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6194,7 +6195,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6203,7 +6203,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6213,7 +6214,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -6247,7 +6247,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6257,7 +6258,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6266,7 +6266,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6276,7 +6277,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6285,7 +6285,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6295,7 +6296,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6304,7 +6304,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6314,7 +6315,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6323,7 +6323,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6333,7 +6334,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6342,7 +6342,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6352,7 +6353,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6361,7 +6361,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6371,7 +6372,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6411,7 +6411,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6421,7 +6422,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6430,11 +6430,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6444,7 +6446,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -6453,7 +6454,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6462,11 +6462,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6476,7 +6478,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 67
                       }
@@ -6485,7 +6486,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6519,7 +6519,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6529,7 +6530,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6538,11 +6538,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6552,7 +6554,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 68
                       }
@@ -6561,7 +6562,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6570,11 +6570,13 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6584,7 +6586,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 68
                       }
@@ -6593,7 +6594,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6633,12 +6633,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6647,12 +6647,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6661,12 +6661,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6675,12 +6675,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6689,12 +6689,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6703,12 +6703,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6742,12 +6742,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6756,12 +6756,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6770,12 +6770,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6784,12 +6784,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6798,12 +6798,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6812,12 +6812,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6857,12 +6857,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6871,12 +6871,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6885,12 +6885,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6899,12 +6899,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6913,12 +6913,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6927,12 +6927,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6966,12 +6966,12 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6980,12 +6980,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6994,12 +6994,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -7008,12 +7008,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -7022,12 +7022,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -7036,12 +7036,12 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -7149,7 +7149,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7172,7 +7173,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 79
               }
@@ -7181,7 +7181,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7191,7 +7192,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 79
               }
@@ -7200,7 +7200,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7210,7 +7211,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 79
               }
@@ -7244,7 +7244,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7267,7 +7268,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 80
               }
@@ -7276,7 +7276,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7286,7 +7287,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 80
               }
@@ -7295,7 +7295,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7305,7 +7306,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 80
               }
@@ -7345,7 +7345,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7368,7 +7369,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7377,7 +7377,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7387,7 +7388,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7396,7 +7396,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7406,7 +7407,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7469,7 +7469,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7492,7 +7493,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 84
               }
@@ -7501,7 +7501,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7511,7 +7512,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 84
               }
@@ -7520,7 +7520,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7530,7 +7531,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 84
               }
@@ -7610,7 +7610,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7639,7 +7640,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7648,7 +7648,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7664,7 +7665,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7698,7 +7698,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7727,7 +7728,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 88
               }
@@ -7736,7 +7736,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7752,7 +7753,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 88
               }
@@ -7792,7 +7792,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7802,7 +7803,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -7814,7 +7814,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7856,7 +7857,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -7922,7 +7922,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7932,7 +7933,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -7944,7 +7944,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7986,7 +7987,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -8069,7 +8069,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8080,7 +8081,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8146,7 +8146,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8157,7 +8158,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8240,14 +8240,16 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8257,7 +8259,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 100
                       }
@@ -8266,7 +8267,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8275,7 +8275,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8288,7 +8289,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8298,7 +8300,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 100
                       }
@@ -8307,7 +8308,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8316,7 +8316,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8326,7 +8327,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8335,7 +8335,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8345,7 +8346,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8354,7 +8354,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8364,7 +8365,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8373,7 +8373,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8383,7 +8384,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8392,7 +8392,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8402,7 +8403,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8411,7 +8411,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8421,7 +8422,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8430,7 +8430,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8440,7 +8441,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 100
               }
@@ -8474,14 +8474,16 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8491,7 +8493,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 101
                       }
@@ -8500,7 +8501,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8509,7 +8509,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8522,7 +8523,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8532,7 +8534,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 101
                       }
@@ -8541,7 +8542,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8550,7 +8550,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8560,7 +8561,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8569,7 +8569,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8579,7 +8580,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8588,7 +8588,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8598,7 +8599,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8607,7 +8607,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8617,7 +8618,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8626,7 +8626,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8636,7 +8637,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8645,7 +8645,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8655,7 +8656,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8664,7 +8664,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8674,7 +8675,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 101
               }
@@ -8714,7 +8714,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8724,7 +8725,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8733,7 +8733,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8743,7 +8744,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8752,7 +8752,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8762,7 +8763,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8771,7 +8771,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8781,7 +8782,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8790,7 +8790,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8800,7 +8801,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8809,7 +8809,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8819,7 +8820,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8828,14 +8828,16 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8845,7 +8847,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -8854,7 +8855,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8888,7 +8888,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8898,7 +8899,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8907,7 +8907,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8917,7 +8918,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8926,7 +8926,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8936,7 +8937,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8945,7 +8945,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8955,7 +8956,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8964,7 +8964,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8974,7 +8975,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8983,7 +8983,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8993,7 +8994,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -9002,14 +9002,16 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -9019,7 +9021,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 104
                       }
@@ -9028,7 +9029,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -9071,7 +9071,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9081,7 +9082,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -9118,7 +9118,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9128,7 +9129,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9168,7 +9168,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9178,7 +9179,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 109
               }
@@ -9187,7 +9187,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9197,7 +9198,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 109
               }
@@ -9231,7 +9231,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9241,7 +9242,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 110
               }
@@ -9250,7 +9250,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9260,7 +9261,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 110
               }
@@ -9300,7 +9300,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9310,7 +9311,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 112
               }
@@ -9344,7 +9344,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9354,7 +9355,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 113
               }
@@ -9394,7 +9394,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9404,7 +9405,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 115
               }
@@ -9413,7 +9413,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9423,7 +9424,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 115
               }
@@ -9457,7 +9457,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9467,7 +9468,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 116
               }
@@ -9476,7 +9476,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9486,7 +9487,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 116
               }
@@ -9526,7 +9526,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9536,7 +9537,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9545,7 +9545,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9568,7 +9569,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9577,7 +9577,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9598,7 +9599,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9632,7 +9632,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9642,7 +9643,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9651,7 +9651,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9674,7 +9675,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9683,7 +9683,8 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9704,7 +9705,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9729,7 +9729,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9763,7 +9764,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9783,7 +9783,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9865,7 +9866,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 123
               }
@@ -9885,16 +9885,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 125
                       }
@@ -9903,12 +9904,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 125
                       }
@@ -9917,12 +9918,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 125
                       }
@@ -9931,12 +9932,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 125
                       }
@@ -9945,12 +9946,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 125
                       }
@@ -9975,7 +9976,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 125
               }
@@ -9995,16 +9995,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10013,12 +10014,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10027,12 +10028,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10041,12 +10042,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10055,12 +10056,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10069,12 +10070,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10083,12 +10084,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 127
                       }
@@ -10117,7 +10118,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 127
               }
@@ -10137,16 +10137,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10155,12 +10156,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10169,12 +10170,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10183,12 +10184,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10197,12 +10198,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10211,12 +10212,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 129
                       }
@@ -10243,7 +10244,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 129
               }
@@ -10263,16 +10263,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 131
                       }
@@ -10281,12 +10282,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 131
                       }
@@ -10295,12 +10296,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 131
                       }
@@ -10321,7 +10322,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 131
               }
@@ -10341,16 +10341,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10359,12 +10360,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10373,12 +10374,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10387,12 +10388,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10401,12 +10402,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10415,12 +10416,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10429,12 +10430,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -10463,7 +10464,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 133
               }
@@ -10483,16 +10483,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 135
                       }
@@ -10501,12 +10502,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 135
                       }
@@ -10515,12 +10516,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 135
                       }
@@ -10529,12 +10530,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 135
                       }
@@ -10543,12 +10544,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 135
                       }
@@ -10573,7 +10574,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 135
               }
@@ -10593,16 +10593,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10611,12 +10612,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10625,12 +10626,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10639,12 +10640,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10653,12 +10654,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10667,12 +10668,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10681,12 +10682,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10695,12 +10696,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10709,12 +10710,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10723,12 +10724,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10737,12 +10738,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10751,12 +10752,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10765,12 +10766,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10779,12 +10780,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -10827,7 +10828,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 137
               }
@@ -10847,11 +10847,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10861,7 +10863,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10870,7 +10871,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10880,7 +10882,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10889,11 +10890,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10903,7 +10906,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 139
                               }
@@ -10912,7 +10914,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10921,7 +10922,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10931,7 +10933,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10940,7 +10941,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10950,7 +10952,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10959,7 +10960,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10969,7 +10971,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10978,7 +10979,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10988,7 +10990,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -10997,7 +10998,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11007,7 +11009,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -11016,7 +11017,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11026,7 +11028,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -11035,7 +11036,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11045,7 +11047,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -11054,7 +11055,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11064,7 +11066,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 139
                       }
@@ -11101,7 +11102,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 139
               }
@@ -11121,11 +11121,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11135,7 +11137,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11144,7 +11145,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11154,7 +11156,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11163,7 +11164,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11173,7 +11175,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11182,7 +11183,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11192,7 +11194,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11201,7 +11202,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11211,7 +11213,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11220,7 +11221,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11230,7 +11232,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11239,7 +11240,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11249,7 +11251,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 141
                       }
@@ -11278,7 +11279,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 141
               }
@@ -11298,11 +11298,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11312,7 +11314,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 143
                       }
@@ -11321,11 +11322,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11335,7 +11338,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -11344,7 +11346,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 143
                       }
@@ -11353,11 +11354,13 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11367,7 +11370,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 143
                               }
@@ -11376,7 +11378,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 143
                       }
@@ -11397,7 +11398,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 143
               }
@@ -11417,16 +11417,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11435,12 +11436,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11449,12 +11450,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11463,12 +11464,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11477,12 +11478,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11491,12 +11492,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 145
                       }
@@ -11523,7 +11524,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 145
               }
@@ -11543,16 +11543,17 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11561,12 +11562,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11575,12 +11576,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11589,12 +11590,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11603,12 +11604,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11617,12 +11618,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 147
                       }
@@ -11649,7 +11650,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 147
               }
@@ -11669,7 +11669,8 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11687,7 +11688,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 149
               }
@@ -11707,11 +11707,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11734,7 +11736,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 151
                       }
@@ -11743,7 +11744,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11753,7 +11755,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 151
                       }
@@ -11762,7 +11763,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11772,7 +11774,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 151
                       }
@@ -11793,7 +11794,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 151
               }
@@ -11838,11 +11838,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11865,7 +11867,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11874,7 +11875,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11884,7 +11886,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11893,7 +11894,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11903,7 +11905,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11924,7 +11925,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 154
               }
@@ -11982,11 +11982,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12015,7 +12017,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -12024,7 +12025,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12040,7 +12042,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -12059,7 +12060,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 157
               }
@@ -12104,11 +12104,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12118,7 +12120,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -12130,7 +12131,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12172,7 +12174,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -12194,7 +12195,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 160
               }
@@ -12214,11 +12214,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12229,7 +12231,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -12249,7 +12250,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 162
               }
@@ -12307,18 +12307,21 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12328,7 +12331,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 165
                               }
@@ -12337,7 +12339,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12346,7 +12347,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12359,7 +12361,8 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12369,7 +12372,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 165
                               }
@@ -12378,7 +12380,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12387,7 +12388,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12397,7 +12399,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12406,7 +12407,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12416,7 +12418,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12425,7 +12426,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12435,7 +12437,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12444,7 +12445,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12454,7 +12456,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12463,7 +12464,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12473,7 +12475,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12482,7 +12483,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12492,7 +12494,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12501,7 +12502,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12511,7 +12513,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 165
                       }
@@ -12544,7 +12545,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 165
               }
@@ -12564,11 +12564,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12578,7 +12580,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12587,7 +12588,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12597,7 +12599,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12606,7 +12607,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12616,7 +12618,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12625,7 +12626,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12635,7 +12637,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12644,7 +12645,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12654,7 +12656,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12663,7 +12664,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12673,7 +12675,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12682,14 +12683,16 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12699,7 +12702,6 @@ $result_trees{'at_commands_in_refs'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 167
                               }
@@ -12708,7 +12710,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 167
                       }
@@ -12737,7 +12738,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 167
               }
@@ -12757,14 +12757,16 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12774,7 +12776,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 169
                       }
@@ -12792,7 +12793,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 169
               }
@@ -12812,11 +12812,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12826,7 +12828,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 171
                       }
@@ -12835,7 +12836,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12845,7 +12847,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 171
                       }
@@ -12864,7 +12865,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 171
               }
@@ -12884,11 +12884,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12898,7 +12900,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 173
                       }
@@ -12915,7 +12916,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 173
               }
@@ -12935,11 +12935,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12949,7 +12951,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 175
                       }
@@ -12958,7 +12959,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12968,7 +12970,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 175
                       }
@@ -12987,7 +12988,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 175
               }
@@ -13007,11 +13007,13 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13021,7 +13023,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 177
                       }
@@ -13030,7 +13031,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13053,7 +13055,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 177
                       }
@@ -13062,7 +13063,8 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13083,7 +13085,6 @@ $result_trees{'at_commands_in_refs'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 177
                       }
@@ -13104,7 +13105,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 177
               }
@@ -13379,238 +13379,238 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2
 
$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'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'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_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 5554c9b216..d8dafd4383 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
@@ -333,12 +333,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -347,12 +347,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -361,12 +361,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -375,12 +375,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -389,12 +389,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -451,12 +451,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -465,12 +465,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -479,12 +479,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -493,12 +493,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -507,12 +507,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -521,12 +521,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -535,12 +535,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -601,12 +601,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -615,12 +615,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -629,12 +629,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -643,12 +643,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -657,12 +657,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -671,12 +671,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -735,12 +735,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -749,12 +749,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -763,12 +763,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -821,12 +821,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -835,12 +835,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -849,12 +849,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -863,12 +863,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -877,12 +877,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -891,12 +891,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -905,12 +905,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -971,12 +971,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -985,12 +985,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -999,12 +999,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1013,12 +1013,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1027,12 +1027,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1089,12 +1089,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1103,12 +1103,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1117,12 +1117,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1131,12 +1131,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1145,12 +1145,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1159,12 +1159,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1173,12 +1173,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1187,12 +1187,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1201,12 +1201,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1215,12 +1215,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1229,12 +1229,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1243,12 +1243,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1257,12 +1257,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1271,12 +1271,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1351,7 +1351,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1361,7 +1362,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1370,7 +1370,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1380,7 +1381,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1389,11 +1389,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1403,7 +1405,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -1412,7 +1413,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1421,7 +1421,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1431,7 +1432,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1440,7 +1440,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1450,7 +1451,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1459,7 +1459,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1469,7 +1470,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1478,7 +1478,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1488,7 +1489,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1497,7 +1497,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1507,7 +1508,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1516,7 +1516,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1526,7 +1527,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1535,7 +1535,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1545,7 +1546,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1554,7 +1554,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1564,7 +1565,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1633,7 +1633,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1643,7 +1644,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1652,7 +1652,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1662,7 +1663,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1671,7 +1671,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1681,7 +1682,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1690,7 +1690,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1700,7 +1701,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1709,7 +1709,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1719,7 +1720,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1728,7 +1728,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1738,7 +1739,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1747,7 +1747,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1757,7 +1758,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1818,7 +1818,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1828,7 +1829,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1837,11 +1837,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1851,7 +1853,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 19
                               }
@@ -1860,7 +1861,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1869,11 +1869,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1883,7 +1885,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 19
                               }
@@ -1892,7 +1893,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1945,12 +1945,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1959,12 +1959,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1973,12 +1973,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1987,12 +1987,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2001,12 +2001,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2015,12 +2015,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2079,12 +2079,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2093,12 +2093,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2107,12 +2107,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2121,12 +2121,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2135,12 +2135,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2149,12 +2149,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2259,7 +2259,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2282,7 +2283,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2291,7 +2291,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2301,7 +2302,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2310,7 +2310,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2320,7 +2321,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2373,8 +2373,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
-                        {
+                      'cmdname' => 'abbr',
+                      'contents' => [
+                        {
                           'contents' => [
                             {
                               'text' => 'CCC'
@@ -2396,7 +2397,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2405,7 +2405,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2415,7 +2416,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2424,7 +2424,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2434,7 +2435,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2487,7 +2487,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2516,7 +2517,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2525,7 +2525,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2541,7 +2542,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2592,7 +2592,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2602,7 +2603,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'iso-8859-15'
                       },
@@ -2614,7 +2614,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2656,7 +2657,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'iso-8859-15'
                       },
@@ -2710,7 +2710,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2721,7 +2722,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -2773,14 +2773,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2790,7 +2792,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2799,7 +2800,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2808,7 +2808,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2821,7 +2822,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2831,7 +2833,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2840,7 +2841,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2849,7 +2849,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2859,7 +2860,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2868,7 +2868,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2878,7 +2879,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2887,7 +2887,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2897,7 +2898,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2906,7 +2906,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2916,7 +2917,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2925,7 +2925,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2935,7 +2936,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2944,7 +2944,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2954,7 +2955,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2963,7 +2963,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2973,7 +2974,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -3038,7 +3038,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3048,7 +3049,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3057,7 +3057,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3067,7 +3068,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3076,7 +3076,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3086,7 +3087,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3095,7 +3095,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3105,7 +3106,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3114,7 +3114,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3124,7 +3125,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3133,7 +3133,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3143,7 +3144,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3152,14 +3152,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3169,7 +3171,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 29
                               }
@@ -3178,7 +3179,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3242,7 +3242,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3252,7 +3253,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 30
                       }
@@ -3302,7 +3302,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3312,7 +3313,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3321,7 +3321,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3331,7 +3332,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3382,7 +3382,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3392,7 +3393,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 32
                       }
@@ -3441,7 +3441,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3451,7 +3452,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 33
                       }
@@ -3460,7 +3460,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3470,7 +3471,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 33
                       }
@@ -3521,7 +3521,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3531,7 +3532,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3540,7 +3540,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3563,7 +3564,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3572,7 +3572,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3593,7 +3594,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3949,12 +3949,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3963,12 +3963,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3977,12 +3977,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3991,12 +3991,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4005,12 +4005,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4044,12 +4044,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4058,12 +4058,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4072,12 +4072,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4086,12 +4086,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4100,12 +4100,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4145,12 +4145,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4159,12 +4159,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4173,12 +4173,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4187,12 +4187,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4201,12 +4201,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4215,12 +4215,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4229,12 +4229,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4268,12 +4268,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4282,12 +4282,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4296,12 +4296,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4310,12 +4310,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4324,12 +4324,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4338,12 +4338,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4352,12 +4352,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4397,12 +4397,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4411,12 +4411,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4425,12 +4425,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4439,12 +4439,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4453,12 +4453,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4467,12 +4467,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4506,12 +4506,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4520,12 +4520,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4534,12 +4534,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4548,12 +4548,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4562,12 +4562,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4576,12 +4576,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4621,12 +4621,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4635,12 +4635,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
-                {
+              'cmdname' => 'leq',
+              'contents' => [
+                {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4649,12 +4649,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4688,12 +4688,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4702,12 +4702,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'leq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4716,12 +4716,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4761,12 +4761,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4775,12 +4775,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4789,12 +4789,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4803,12 +4803,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4817,12 +4817,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4831,12 +4831,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4845,12 +4845,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4884,12 +4884,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4898,12 +4898,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4912,12 +4912,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4926,12 +4926,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4940,12 +4940,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4954,12 +4954,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4968,12 +4968,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5013,12 +5013,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5027,12 +5027,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5041,12 +5041,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5055,12 +5055,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5069,12 +5069,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5108,12 +5108,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5122,12 +5122,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5136,12 +5136,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5150,12 +5150,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5164,12 +5164,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5209,12 +5209,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5223,12 +5223,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5237,12 +5237,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5251,12 +5251,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5265,12 +5265,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5279,12 +5279,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5293,12 +5293,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5307,12 +5307,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5321,12 +5321,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5335,12 +5335,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5349,12 +5349,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5363,12 +5363,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5377,12 +5377,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5391,12 +5391,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5430,12 +5430,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5444,12 +5444,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5458,12 +5458,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5472,12 +5472,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5486,12 +5486,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5500,12 +5500,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5514,12 +5514,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5528,12 +5528,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5542,12 +5542,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5556,12 +5556,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5570,12 +5570,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5584,12 +5584,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5598,12 +5598,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5612,12 +5612,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5657,7 +5657,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5667,7 +5668,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5676,7 +5676,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5686,7 +5687,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5695,11 +5695,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5709,7 +5711,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 64
                       }
@@ -5718,7 +5719,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5727,7 +5727,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5737,7 +5738,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5746,7 +5746,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5756,7 +5757,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5765,7 +5765,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5775,7 +5776,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5784,7 +5784,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5794,7 +5795,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5803,7 +5803,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5813,7 +5814,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5822,7 +5822,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5832,7 +5833,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5841,7 +5841,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5851,7 +5852,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5860,7 +5860,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5870,7 +5871,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5904,7 +5904,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5914,7 +5915,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5923,7 +5923,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5933,7 +5934,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5942,11 +5942,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5956,7 +5958,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -5965,7 +5966,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5974,7 +5974,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5984,7 +5985,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5993,7 +5993,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6003,7 +6004,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6012,7 +6012,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6022,7 +6023,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6031,7 +6031,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6041,7 +6042,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6050,7 +6050,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6060,7 +6061,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6069,7 +6069,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6079,7 +6080,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6088,7 +6088,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6098,7 +6099,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6107,7 +6107,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6117,7 +6118,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6157,7 +6157,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6167,7 +6168,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6176,7 +6176,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6186,7 +6187,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6195,7 +6195,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6205,7 +6206,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6214,7 +6214,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6224,7 +6225,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6233,7 +6233,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6243,7 +6244,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6252,7 +6252,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6262,7 +6263,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6271,7 +6271,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6281,7 +6282,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6315,7 +6315,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6325,7 +6326,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6334,7 +6334,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6344,7 +6345,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6353,7 +6353,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6363,7 +6364,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6372,7 +6372,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6382,7 +6383,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6391,7 +6391,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6401,7 +6402,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6410,7 +6410,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6420,7 +6421,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6429,7 +6429,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6439,7 +6440,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6479,7 +6479,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6489,7 +6490,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6498,11 +6498,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6512,7 +6514,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 70
                       }
@@ -6521,7 +6522,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6530,11 +6530,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6544,7 +6546,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 70
                       }
@@ -6553,7 +6554,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6587,7 +6587,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6597,7 +6598,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6606,11 +6606,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6620,7 +6622,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -6629,7 +6630,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6638,11 +6638,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6652,7 +6654,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -6661,7 +6662,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6701,12 +6701,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6715,12 +6715,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6729,12 +6729,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6743,12 +6743,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6757,12 +6757,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6771,12 +6771,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6810,12 +6810,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6824,12 +6824,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6838,12 +6838,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6852,12 +6852,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6866,12 +6866,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6880,12 +6880,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6925,12 +6925,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6939,12 +6939,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6953,12 +6953,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6967,12 +6967,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6981,12 +6981,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6995,12 +6995,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -7034,12 +7034,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7048,12 +7048,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7062,12 +7062,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7076,12 +7076,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7090,12 +7090,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7104,12 +7104,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7217,7 +7217,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7240,7 +7241,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7249,7 +7249,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7259,7 +7260,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7268,7 +7268,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7278,7 +7279,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7312,7 +7312,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7335,7 +7336,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7344,7 +7344,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7354,7 +7355,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7363,7 +7363,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7373,7 +7374,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7413,7 +7413,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7436,7 +7437,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7445,7 +7445,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7455,7 +7456,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7464,7 +7464,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7474,7 +7475,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7537,7 +7537,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7560,7 +7561,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7569,7 +7569,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7579,7 +7580,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7588,7 +7588,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7598,7 +7599,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7678,7 +7678,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7707,7 +7708,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 90
               }
@@ -7716,7 +7716,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7732,7 +7733,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 90
               }
@@ -7766,7 +7766,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7795,7 +7796,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 91
               }
@@ -7804,7 +7804,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7820,7 +7821,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 91
               }
@@ -7860,7 +7860,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7870,7 +7871,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'iso-8859-15'
               },
@@ -7882,7 +7882,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7924,7 +7925,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'iso-8859-15'
               },
@@ -7990,7 +7990,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8000,7 +8001,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'iso-8859-15'
               },
@@ -8012,7 +8012,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8054,7 +8055,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'iso-8859-15'
               },
@@ -8137,7 +8137,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8148,7 +8149,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8214,7 +8214,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8225,7 +8226,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8308,14 +8308,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8325,7 +8327,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -8334,7 +8335,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8343,7 +8343,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8356,7 +8357,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8366,7 +8368,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -8375,7 +8376,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8384,7 +8384,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8394,7 +8395,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8403,7 +8403,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8413,7 +8414,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8422,7 +8422,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8432,7 +8433,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8441,7 +8441,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8451,7 +8452,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8460,7 +8460,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8470,7 +8471,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8479,7 +8479,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8489,7 +8490,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8498,7 +8498,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8508,7 +8509,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8542,14 +8542,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8559,7 +8561,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 104
                       }
@@ -8568,7 +8569,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8577,7 +8577,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8590,7 +8591,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8600,7 +8602,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 104
                       }
@@ -8609,7 +8610,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8618,7 +8618,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8628,7 +8629,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8637,7 +8637,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8647,7 +8648,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8656,7 +8656,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8666,7 +8667,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8675,7 +8675,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8685,7 +8686,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8694,7 +8694,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8704,7 +8705,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8713,7 +8713,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8723,7 +8724,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8732,7 +8732,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8742,7 +8743,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8782,7 +8782,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8792,7 +8793,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8801,7 +8801,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8811,7 +8812,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8820,7 +8820,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8830,7 +8831,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8839,7 +8839,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8849,7 +8850,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8858,7 +8858,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8868,7 +8869,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8877,7 +8877,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8887,7 +8888,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8896,14 +8896,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8913,7 +8915,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 106
                       }
@@ -8922,7 +8923,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8956,7 +8956,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8966,7 +8967,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -8975,7 +8975,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8985,7 +8986,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -8994,7 +8994,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9004,7 +9005,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9013,7 +9013,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9023,7 +9024,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9032,7 +9032,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9042,7 +9043,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9051,7 +9051,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9061,7 +9062,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9070,14 +9070,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -9087,7 +9089,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -9096,7 +9097,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9139,7 +9139,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9149,7 +9150,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 109
               }
@@ -9186,7 +9186,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9196,7 +9197,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 110
               }
@@ -9236,7 +9236,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9246,7 +9247,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 112
               }
@@ -9255,7 +9255,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9265,7 +9266,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 112
               }
@@ -9299,7 +9299,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9309,7 +9310,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 113
               }
@@ -9318,7 +9318,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9328,7 +9329,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 113
               }
@@ -9368,7 +9368,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9378,7 +9379,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 115
               }
@@ -9412,7 +9412,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9422,7 +9423,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 116
               }
@@ -9462,7 +9462,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9472,7 +9473,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9481,7 +9481,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9491,7 +9492,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9525,7 +9525,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9535,7 +9536,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9544,7 +9544,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9554,7 +9555,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9594,7 +9594,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9604,7 +9605,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9613,7 +9613,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9636,7 +9637,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9645,7 +9645,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9666,7 +9667,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9700,7 +9700,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9710,7 +9711,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9719,7 +9719,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9742,7 +9743,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9751,7 +9751,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9772,7 +9773,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9797,7 +9797,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9831,7 +9832,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 124
               }
@@ -9851,7 +9851,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9933,7 +9934,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 126
               }
@@ -9953,16 +9953,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9971,12 +9972,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9985,12 +9986,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9999,12 +10000,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -10013,12 +10014,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -10043,7 +10044,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 128
               }
@@ -10063,16 +10063,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10081,12 +10082,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10095,12 +10096,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10109,12 +10110,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10123,12 +10124,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10137,12 +10138,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10151,12 +10152,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10185,7 +10186,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 130
               }
@@ -10205,16 +10205,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10223,12 +10224,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10237,12 +10238,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10251,12 +10252,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10265,12 +10266,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10279,12 +10280,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10311,7 +10312,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 132
               }
@@ -10331,16 +10331,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10349,12 +10350,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10363,12 +10364,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10389,7 +10390,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 134
               }
@@ -10409,16 +10409,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10427,12 +10428,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10441,12 +10442,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10455,12 +10456,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10469,12 +10470,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10483,12 +10484,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10497,12 +10498,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10531,7 +10532,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 136
               }
@@ -10551,16 +10551,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10569,12 +10570,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10583,12 +10584,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10597,12 +10598,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10611,12 +10612,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10641,7 +10642,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 138
               }
@@ -10661,16 +10661,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10679,12 +10680,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10693,12 +10694,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10707,12 +10708,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10721,12 +10722,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10735,12 +10736,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10749,12 +10750,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10763,12 +10764,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10777,12 +10778,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10791,12 +10792,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10805,12 +10806,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10819,12 +10820,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10833,12 +10834,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10847,12 +10848,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10895,7 +10896,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 140
               }
@@ -10915,11 +10915,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10929,7 +10931,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10938,7 +10939,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10948,7 +10950,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10957,11 +10958,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10971,7 +10974,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 142
                               }
@@ -10980,7 +10982,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10989,7 +10990,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10999,7 +11001,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11008,7 +11009,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11018,7 +11020,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11027,7 +11028,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11037,7 +11039,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11046,7 +11047,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11056,7 +11058,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11065,7 +11066,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11075,7 +11077,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11084,7 +11085,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11094,7 +11096,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11103,7 +11104,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11113,7 +11115,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11122,7 +11123,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11132,7 +11134,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11169,7 +11170,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 142
               }
@@ -11189,11 +11189,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11203,7 +11205,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11212,7 +11213,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11222,7 +11224,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11231,7 +11232,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11241,7 +11243,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11250,7 +11251,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11260,7 +11262,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11269,7 +11270,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11279,7 +11281,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11288,7 +11289,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11298,7 +11300,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11307,7 +11308,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11317,7 +11319,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11346,7 +11347,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 144
               }
@@ -11366,11 +11366,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11380,7 +11382,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11389,11 +11390,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11403,7 +11406,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -11412,7 +11414,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11421,11 +11422,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11435,7 +11438,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -11444,7 +11446,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11465,7 +11466,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 146
               }
@@ -11485,16 +11485,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11503,12 +11504,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11517,12 +11518,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11531,12 +11532,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11545,12 +11546,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11559,12 +11560,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11591,7 +11592,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 148
               }
@@ -11611,16 +11611,17 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11629,12 +11630,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11643,12 +11644,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11657,12 +11658,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11671,12 +11672,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11685,12 +11686,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11717,7 +11718,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 150
               }
@@ -11737,7 +11737,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11755,7 +11756,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 152
               }
@@ -11775,11 +11775,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11802,7 +11804,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11811,7 +11812,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11821,7 +11823,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11830,7 +11831,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11840,7 +11842,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11861,7 +11862,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 154
               }
@@ -11906,11 +11906,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11933,7 +11935,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11942,7 +11943,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11952,7 +11954,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11961,7 +11962,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11971,7 +11973,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11992,7 +11993,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 157
               }
@@ -12050,11 +12050,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12083,7 +12085,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 160
                       }
@@ -12092,7 +12093,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12108,7 +12110,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 160
                       }
@@ -12127,7 +12128,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 160
               }
@@ -12172,11 +12172,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12186,7 +12188,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'iso-8859-15'
                       },
@@ -12198,7 +12199,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12240,7 +12242,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'iso-8859-15'
                       },
@@ -12262,7 +12263,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 163
               }
@@ -12282,11 +12282,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12297,7 +12299,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -12317,7 +12318,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 165
               }
@@ -12375,18 +12375,21 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12396,7 +12399,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 168
                               }
@@ -12405,7 +12407,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12414,7 +12415,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12427,7 +12429,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12437,7 +12440,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 168
                               }
@@ -12446,7 +12448,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12455,7 +12456,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12465,7 +12467,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12474,7 +12475,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12484,7 +12486,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12493,7 +12494,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12503,7 +12505,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12512,7 +12513,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12522,7 +12524,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12531,7 +12532,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12541,7 +12543,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12550,7 +12551,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12560,7 +12562,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12569,7 +12570,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12579,7 +12581,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12612,7 +12613,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 168
               }
@@ -12632,11 +12632,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12646,7 +12648,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12655,7 +12656,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12665,7 +12667,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12674,7 +12675,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12684,7 +12686,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12693,7 +12694,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12703,7 +12705,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12712,7 +12713,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12722,7 +12724,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12731,7 +12732,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12741,7 +12743,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12750,14 +12751,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12767,7 +12770,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 170
                               }
@@ -12776,7 +12778,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12805,7 +12806,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 170
               }
@@ -12825,14 +12825,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12842,7 +12844,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 172
                       }
@@ -12860,7 +12861,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 172
               }
@@ -12880,11 +12880,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12894,7 +12896,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 174
                       }
@@ -12903,7 +12904,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12913,7 +12915,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 174
                       }
@@ -12932,7 +12933,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 174
               }
@@ -12952,11 +12952,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12966,7 +12968,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 176
                       }
@@ -12983,7 +12984,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 176
               }
@@ -13003,11 +13003,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13017,7 +13019,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 178
                       }
@@ -13026,7 +13027,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13036,7 +13038,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 178
                       }
@@ -13055,7 +13056,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 178
               }
@@ -13075,11 +13075,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13089,7 +13091,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13098,7 +13099,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13121,7 +13123,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13130,7 +13131,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13151,7 +13153,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13172,7 +13173,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 180
               }
@@ -13447,238 +13447,238 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'conte
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'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'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'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_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 b6a97b8b9b..8d7f5f51e8 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
@@ -333,12 +333,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -347,12 +347,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -361,12 +361,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -375,12 +375,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -389,12 +389,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -451,12 +451,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -465,12 +465,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -479,12 +479,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -493,12 +493,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -507,12 +507,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -521,12 +521,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -535,12 +535,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -601,12 +601,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -615,12 +615,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -629,12 +629,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -643,12 +643,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -657,12 +657,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -671,12 +671,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 12
                       }
@@ -735,12 +735,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -749,12 +749,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -763,12 +763,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -821,12 +821,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -835,12 +835,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -849,12 +849,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -863,12 +863,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -877,12 +877,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -891,12 +891,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -905,12 +905,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -971,12 +971,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -985,12 +985,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -999,12 +999,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1013,12 +1013,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1027,12 +1027,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -1089,12 +1089,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1103,12 +1103,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1117,12 +1117,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1131,12 +1131,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1145,12 +1145,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1159,12 +1159,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1173,12 +1173,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1187,12 +1187,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1201,12 +1201,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1215,12 +1215,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1229,12 +1229,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1243,12 +1243,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1257,12 +1257,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1271,12 +1271,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -1351,7 +1351,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1361,7 +1362,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1370,7 +1370,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1380,7 +1381,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1389,11 +1389,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1403,7 +1405,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -1412,7 +1413,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1421,7 +1421,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1431,7 +1432,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1440,7 +1440,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1450,7 +1451,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1459,7 +1459,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1469,7 +1470,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1478,7 +1478,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1488,7 +1489,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1497,7 +1497,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1507,7 +1508,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1516,7 +1516,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1526,7 +1527,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1535,7 +1535,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1545,7 +1546,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1554,7 +1554,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1564,7 +1565,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -1633,7 +1633,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1643,7 +1644,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1652,7 +1652,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1662,7 +1663,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1671,7 +1671,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1681,7 +1682,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1690,7 +1690,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1700,7 +1701,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1709,7 +1709,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1719,7 +1720,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1728,7 +1728,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1738,7 +1739,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1747,7 +1747,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1757,7 +1758,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -1818,7 +1818,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1828,7 +1829,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1837,11 +1837,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1851,7 +1853,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 19
                               }
@@ -1860,7 +1861,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1869,11 +1869,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1883,7 +1885,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 19
                               }
@@ -1892,7 +1893,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -1945,12 +1945,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1959,12 +1959,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1973,12 +1973,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -1987,12 +1987,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2001,12 +2001,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2015,12 +2015,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 20
                       }
@@ -2079,12 +2079,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2093,12 +2093,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2107,12 +2107,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2121,12 +2121,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2135,12 +2135,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2149,12 +2149,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 21
                       }
@@ -2259,7 +2259,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2282,7 +2283,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2291,7 +2291,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2301,7 +2302,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2310,7 +2310,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2320,7 +2321,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -2373,8 +2373,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
-                        {
+                      'cmdname' => 'abbr',
+                      'contents' => [
+                        {
                           'contents' => [
                             {
                               'text' => 'CCC'
@@ -2396,7 +2397,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2405,7 +2405,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2415,7 +2416,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2424,7 +2424,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2434,7 +2435,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -2487,7 +2487,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2516,7 +2517,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2525,7 +2525,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2541,7 +2542,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -2592,7 +2592,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2602,7 +2603,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -2614,7 +2614,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2656,7 +2657,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -2710,7 +2710,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2721,7 +2722,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -2773,14 +2773,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2790,7 +2792,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2799,7 +2800,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2808,7 +2808,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2821,7 +2822,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2831,7 +2833,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 28
                               }
@@ -2840,7 +2841,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2849,7 +2849,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2859,7 +2860,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2868,7 +2868,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2878,7 +2879,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2887,7 +2887,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2897,7 +2898,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2906,7 +2906,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2916,7 +2917,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2925,7 +2925,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2935,7 +2936,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2944,7 +2944,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2954,7 +2955,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -2963,7 +2963,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2973,7 +2974,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -3038,7 +3038,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3048,7 +3049,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3057,7 +3057,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3067,7 +3068,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3076,7 +3076,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3086,7 +3087,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3095,7 +3095,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3105,7 +3106,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3114,7 +3114,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3124,7 +3125,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3133,7 +3133,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3143,7 +3144,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3152,14 +3152,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3169,7 +3171,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 29
                               }
@@ -3178,7 +3179,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 29
                       }
@@ -3242,7 +3242,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3252,7 +3253,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 30
                       }
@@ -3302,7 +3302,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3312,7 +3313,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3321,7 +3321,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3331,7 +3332,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -3382,7 +3382,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3392,7 +3393,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 32
                       }
@@ -3441,7 +3441,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3451,7 +3452,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 33
                       }
@@ -3460,7 +3460,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3470,7 +3471,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 33
                       }
@@ -3521,7 +3521,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3531,7 +3532,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3540,7 +3540,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3563,7 +3564,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3572,7 +3572,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3593,7 +3594,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 34
                       }
@@ -3949,12 +3949,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3963,12 +3963,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3977,12 +3977,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -3991,12 +3991,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4005,12 +4005,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -4044,12 +4044,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'atchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'atchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4058,12 +4058,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4072,12 +4072,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'rbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'rbracechar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4086,12 +4086,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'backslashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'backslashchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4100,12 +4100,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_info' => {
                 'line_nr' => 44
               }
@@ -4145,12 +4145,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4159,12 +4159,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4173,12 +4173,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4187,12 +4187,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4201,12 +4201,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4215,12 +4215,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4229,12 +4229,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 46
               }
@@ -4268,12 +4268,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4282,12 +4282,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4296,12 +4296,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4310,12 +4310,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4324,12 +4324,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4338,12 +4338,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4352,12 +4352,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 47
               }
@@ -4397,12 +4397,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4411,12 +4411,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4425,12 +4425,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4439,12 +4439,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4453,12 +4453,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4467,12 +4467,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 49
               }
@@ -4506,12 +4506,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4520,12 +4520,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4534,12 +4534,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'euro',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'euro',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4548,12 +4548,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4562,12 +4562,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4576,12 +4576,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 50
               }
@@ -4621,12 +4621,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4635,12 +4635,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
-                {
+              'cmdname' => 'leq',
+              'contents' => [
+                {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4649,12 +4649,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 52
               }
@@ -4688,12 +4688,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4702,12 +4702,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'leq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'leq',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4716,12 +4716,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'arrow',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'arrow',
               'source_info' => {
                 'line_nr' => 53
               }
@@ -4761,12 +4761,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4775,12 +4775,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4789,12 +4789,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4803,12 +4803,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4817,12 +4817,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4831,12 +4831,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4845,12 +4845,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 55
               }
@@ -4884,12 +4884,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ordf',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordf',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4898,12 +4898,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ordm',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ordm',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4912,12 +4912,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'point',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'point',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4926,12 +4926,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'pounds',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'pounds',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4940,12 +4940,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'print',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'print',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4954,12 +4954,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'questiondown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'questiondown',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -4968,12 +4968,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -5013,12 +5013,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5027,12 +5027,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5041,12 +5041,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5055,12 +5055,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5069,12 +5069,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 58
               }
@@ -5108,12 +5108,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'result',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'result',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5122,12 +5122,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'textdegree',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'textdegree',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5136,12 +5136,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => 'tie',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tie',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5150,12 +5150,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'b '
             },
             {
-              'args' => [
+              'cmdname' => 'today',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'today',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5164,12 +5164,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'line_nr' => 59
               }
@@ -5209,12 +5209,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5223,12 +5223,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5237,12 +5237,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5251,12 +5251,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5265,12 +5265,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5279,12 +5279,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5293,12 +5293,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5307,12 +5307,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5321,12 +5321,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5335,12 +5335,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5349,12 +5349,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5363,12 +5363,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5377,12 +5377,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5391,12 +5391,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 61
               }
@@ -5430,12 +5430,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5444,12 +5444,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ae',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ae',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5458,12 +5458,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'oe',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'oe',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5472,12 +5472,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AE',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5486,12 +5486,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'OE',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'OE',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5500,12 +5500,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'o',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'o',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5514,12 +5514,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'O',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'O',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5528,12 +5528,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ss',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ss',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5542,12 +5542,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5556,12 +5556,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'L',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'L',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5570,12 +5570,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'DH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'DH',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5584,12 +5584,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dh',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dh',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5598,12 +5598,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'TH',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TH',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5612,12 +5612,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'th',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'th',
               'source_info' => {
                 'line_nr' => 62
               }
@@ -5657,7 +5657,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5667,7 +5668,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5676,7 +5676,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5686,7 +5687,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5695,11 +5695,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5709,7 +5711,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 64
                       }
@@ -5718,7 +5719,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5727,7 +5727,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5737,7 +5738,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5746,7 +5746,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5756,7 +5757,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5765,7 +5765,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5775,7 +5776,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5784,7 +5784,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5794,7 +5795,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5803,7 +5803,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5813,7 +5814,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5822,7 +5822,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5832,7 +5833,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5841,7 +5841,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5851,7 +5852,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5860,7 +5860,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5870,7 +5871,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 64
               }
@@ -5904,7 +5904,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5914,7 +5915,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5923,7 +5923,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5933,7 +5934,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5942,11 +5942,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -5956,7 +5958,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 65
                       }
@@ -5965,7 +5966,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5974,7 +5974,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -5984,7 +5985,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -5993,7 +5993,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6003,7 +6004,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6012,7 +6012,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6022,7 +6023,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6031,7 +6031,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6041,7 +6042,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6050,7 +6050,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6060,7 +6061,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6069,7 +6069,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6079,7 +6080,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6088,7 +6088,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'H',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6098,7 +6099,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'H',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6107,7 +6107,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ogonek',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6117,7 +6118,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ogonek',
               'source_info' => {
                 'line_nr' => 65
               }
@@ -6157,7 +6157,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6167,7 +6168,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6176,7 +6176,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6186,7 +6187,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6195,7 +6195,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6205,7 +6206,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6214,7 +6214,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6224,7 +6225,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6233,7 +6233,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6243,7 +6244,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6252,7 +6252,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6262,7 +6263,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6271,7 +6271,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6281,7 +6282,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 67
               }
@@ -6315,7 +6315,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6325,7 +6326,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6334,7 +6334,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6344,7 +6345,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6353,7 +6353,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ubaraccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6363,7 +6364,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ubaraccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6372,7 +6372,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6382,7 +6383,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6391,7 +6391,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6401,7 +6402,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6410,7 +6410,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6420,7 +6421,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6429,7 +6429,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'tieaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6439,7 +6440,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'tieaccent',
               'source_info' => {
                 'line_nr' => 68
               }
@@ -6479,7 +6479,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6489,7 +6490,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6498,11 +6498,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6512,7 +6514,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 70
                       }
@@ -6521,7 +6522,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6530,11 +6530,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6544,7 +6546,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 70
                       }
@@ -6553,7 +6554,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 70
               }
@@ -6587,7 +6587,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -6597,7 +6598,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6606,11 +6606,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6620,7 +6622,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -6629,7 +6630,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6638,11 +6638,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -6652,7 +6654,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -6661,7 +6662,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 71
               }
@@ -6701,12 +6701,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6715,12 +6715,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6729,12 +6729,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6743,12 +6743,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6757,12 +6757,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6771,12 +6771,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 73
               }
@@ -6810,12 +6810,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6824,12 +6824,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6838,12 +6838,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteleft',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6852,12 +6852,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quoteright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quoteright',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6866,12 +6866,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblbase',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6880,12 +6880,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'quotesinglbase',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotesinglbase',
               'source_info' => {
                 'line_nr' => 74
               }
@@ -6925,12 +6925,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6939,12 +6939,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6953,12 +6953,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6967,12 +6967,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6981,12 +6981,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -6995,12 +6995,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 76
               }
@@ -7034,12 +7034,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'guillemetleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7048,12 +7048,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemetright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemetright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7062,12 +7062,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7076,12 +7076,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guillemotright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guillemotright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7090,12 +7090,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglleft',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7104,12 +7104,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'guilsinglright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'guilsinglright',
               'source_info' => {
                 'line_nr' => 77
               }
@@ -7217,7 +7217,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7240,7 +7241,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7249,7 +7249,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7259,7 +7260,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7268,7 +7268,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7278,7 +7279,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -7312,7 +7312,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7335,7 +7336,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7344,7 +7344,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7354,7 +7355,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7363,7 +7363,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7373,7 +7374,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 83
               }
@@ -7413,7 +7413,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7436,7 +7437,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7445,7 +7445,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7455,7 +7456,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7464,7 +7464,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7474,7 +7475,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 85
               }
@@ -7537,7 +7537,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7560,7 +7561,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7569,7 +7569,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7579,7 +7580,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7588,7 +7588,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7598,7 +7599,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 87
               }
@@ -7678,7 +7678,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7707,7 +7708,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 90
               }
@@ -7716,7 +7716,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7732,7 +7733,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 90
               }
@@ -7766,7 +7766,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7795,7 +7796,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 91
               }
@@ -7804,7 +7804,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7820,7 +7821,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 91
               }
@@ -7860,7 +7860,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7870,7 +7871,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -7882,7 +7882,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -7924,7 +7925,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -7990,7 +7990,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8000,7 +8001,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -8012,7 +8012,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '  '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8054,7 +8055,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -8137,7 +8137,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8148,7 +8149,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8214,7 +8214,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8225,7 +8226,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
@@ -8308,14 +8308,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8325,7 +8327,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -8334,7 +8335,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8343,7 +8343,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8356,7 +8357,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8366,7 +8368,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -8375,7 +8376,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8384,7 +8384,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8394,7 +8395,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8403,7 +8403,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8413,7 +8414,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8422,7 +8422,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8432,7 +8433,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8441,7 +8441,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8451,7 +8452,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8460,7 +8460,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8470,7 +8471,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8479,7 +8479,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8489,7 +8490,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8498,7 +8498,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8508,7 +8509,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 103
               }
@@ -8542,14 +8542,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cite '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8559,7 +8561,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 104
                       }
@@ -8568,7 +8569,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8577,7 +8577,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8590,7 +8591,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8600,7 +8602,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 104
                       }
@@ -8609,7 +8610,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8618,7 +8618,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8628,7 +8629,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8637,7 +8637,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8647,7 +8648,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8656,7 +8656,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8666,7 +8667,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8675,7 +8675,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 't',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8685,7 +8686,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 't',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8694,7 +8694,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8704,7 +8705,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8713,7 +8713,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8723,7 +8724,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8732,7 +8732,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'i',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8742,7 +8743,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'i',
               'source_info' => {
                 'line_nr' => 104
               }
@@ -8782,7 +8782,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8792,7 +8793,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8801,7 +8801,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8811,7 +8812,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8820,7 +8820,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8830,7 +8831,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8839,7 +8839,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8849,7 +8850,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8858,7 +8858,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8868,7 +8869,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8877,7 +8877,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8887,7 +8888,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8896,14 +8896,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -8913,7 +8915,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 106
                       }
@@ -8922,7 +8923,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 106
               }
@@ -8956,7 +8956,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'env',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8966,7 +8967,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'env',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -8975,7 +8975,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -8985,7 +8986,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -8994,7 +8994,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'option',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9004,7 +9005,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'option',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9013,7 +9013,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9023,7 +9024,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9032,7 +9032,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9042,7 +9043,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9051,7 +9051,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'file',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9061,7 +9062,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'file',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9070,14 +9070,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'C-x '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'key',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -9087,7 +9089,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'key',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -9096,7 +9097,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 107
               }
@@ -9139,7 +9139,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9149,7 +9150,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 109
               }
@@ -9186,7 +9186,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '8.27'
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9196,7 +9197,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 110
               }
@@ -9236,7 +9236,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9246,7 +9247,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 112
               }
@@ -9255,7 +9255,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9265,7 +9266,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 112
               }
@@ -9299,7 +9299,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9309,7 +9310,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 113
               }
@@ -9318,7 +9318,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'slanted',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9328,7 +9329,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'slanted',
               'source_info' => {
                 'line_nr' => 113
               }
@@ -9368,7 +9368,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9378,7 +9379,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 115
               }
@@ -9412,7 +9412,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9422,7 +9423,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 116
               }
@@ -9462,7 +9462,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9472,7 +9473,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9481,7 +9481,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9491,7 +9492,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 118
               }
@@ -9525,7 +9525,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sub',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9535,7 +9536,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sub',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9544,7 +9544,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'H 3'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9554,7 +9555,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 119
               }
@@ -9594,7 +9594,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9604,7 +9605,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9613,7 +9613,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9636,7 +9637,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9645,7 +9645,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9666,7 +9667,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 121
               }
@@ -9700,7 +9700,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9710,7 +9711,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9719,7 +9719,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9742,7 +9743,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9751,7 +9751,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9772,7 +9773,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 122
               }
@@ -9797,7 +9797,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9831,7 +9832,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 124
               }
@@ -9851,7 +9851,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -9933,7 +9934,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 126
               }
@@ -9953,16 +9953,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9971,12 +9972,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9985,12 +9986,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'rbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'rbracechar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -9999,12 +10000,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -10013,12 +10014,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'hashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'hashchar',
                       'source_info' => {
                         'line_nr' => 128
                       }
@@ -10043,7 +10044,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 128
               }
@@ -10063,16 +10063,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'LaTeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'LaTeX',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10081,12 +10082,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10095,12 +10096,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10109,12 +10110,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10123,12 +10124,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'copyright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'copyright',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10137,12 +10138,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dots',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10151,12 +10152,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 130
                       }
@@ -10185,7 +10186,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 130
               }
@@ -10205,16 +10205,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10223,12 +10224,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10237,12 +10238,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'euro',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'euro',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10251,12 +10252,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10265,12 +10266,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'expansion',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'expansion',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10279,12 +10280,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 132
                       }
@@ -10311,7 +10312,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 132
               }
@@ -10331,16 +10331,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10349,12 +10350,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'leq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'leq',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10363,12 +10364,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'arrow',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'arrow',
                       'source_info' => {
                         'line_nr' => 134
                       }
@@ -10389,7 +10390,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 134
               }
@@ -10409,16 +10409,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ordf',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordf',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10427,12 +10428,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ordm',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ordm',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10441,12 +10442,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'point',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'point',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10455,12 +10456,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'pounds',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'pounds',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10469,12 +10470,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'print',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'print',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10483,12 +10484,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'questiondown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'questiondown',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10497,12 +10498,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 136
                       }
@@ -10531,7 +10532,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 136
               }
@@ -10551,16 +10551,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'result',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'result',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10569,12 +10570,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'textdegree',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'textdegree',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10583,12 +10584,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' a'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10597,12 +10598,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10611,12 +10612,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 138
                       }
@@ -10641,7 +10642,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 138
               }
@@ -10661,16 +10661,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10679,12 +10680,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ae',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ae',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10693,12 +10694,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'oe',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'oe',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10707,12 +10708,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AE',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10721,12 +10722,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'OE',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'OE',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10735,12 +10736,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'o',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'o',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10749,12 +10750,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'O',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'O',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10763,12 +10764,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ss',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ss',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10777,12 +10778,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'l',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'l',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10791,12 +10792,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'L',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'L',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10805,12 +10806,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'DH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'DH',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10819,12 +10820,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dh',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dh',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10833,12 +10834,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TH',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TH',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10847,12 +10848,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'th',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'th',
                       'source_info' => {
                         'line_nr' => 140
                       }
@@ -10895,7 +10896,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 140
               }
@@ -10915,11 +10915,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10929,7 +10931,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10938,7 +10939,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10948,7 +10950,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10957,11 +10958,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -10971,7 +10974,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 142
                               }
@@ -10980,7 +10982,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -10989,7 +10990,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -10999,7 +11001,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11008,7 +11009,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11018,7 +11020,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11027,7 +11028,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11037,7 +11039,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11046,7 +11047,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11056,7 +11058,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11065,7 +11066,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11075,7 +11077,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11084,7 +11085,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ringaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11094,7 +11096,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ringaccent',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11103,7 +11104,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'H',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11113,7 +11115,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'H',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11122,7 +11123,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11132,7 +11134,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -11169,7 +11170,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 142
               }
@@ -11189,11 +11189,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11203,7 +11205,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11212,7 +11213,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11222,7 +11224,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11231,7 +11232,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11241,7 +11243,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11250,7 +11251,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11260,7 +11262,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11269,7 +11270,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11279,7 +11281,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11288,7 +11289,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11298,7 +11300,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11307,7 +11308,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11317,7 +11319,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 144
                       }
@@ -11346,7 +11347,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 144
               }
@@ -11366,11 +11366,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11380,7 +11382,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11389,11 +11390,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11403,7 +11406,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -11412,7 +11414,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11421,11 +11422,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -11435,7 +11438,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 146
                               }
@@ -11444,7 +11446,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 146
                       }
@@ -11465,7 +11466,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 146
               }
@@ -11485,16 +11485,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11503,12 +11504,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblright',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11517,12 +11518,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteleft',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11531,12 +11532,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quoteright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quoteright',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11545,12 +11546,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblbase',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11559,12 +11560,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotesinglbase',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotesinglbase',
                       'source_info' => {
                         'line_nr' => 148
                       }
@@ -11591,7 +11592,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 148
               }
@@ -11611,16 +11611,17 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11629,12 +11630,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemetright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemetright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11643,12 +11644,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11657,12 +11658,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guillemotright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guillemotright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11671,12 +11672,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglleft',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11685,12 +11686,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'guilsinglright',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'guilsinglright',
                       'source_info' => {
                         'line_nr' => 150
                       }
@@ -11717,7 +11718,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 150
               }
@@ -11737,7 +11737,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -11755,7 +11756,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 152
               }
@@ -11775,11 +11775,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11802,7 +11804,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11811,7 +11812,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11821,7 +11823,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11830,7 +11831,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11840,7 +11842,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 154
                       }
@@ -11861,7 +11862,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 154
               }
@@ -11906,11 +11906,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11933,7 +11935,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11942,7 +11943,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11952,7 +11954,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11961,7 +11962,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'abbr',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -11971,7 +11973,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'abbr',
                       'source_info' => {
                         'line_nr' => 157
                       }
@@ -11992,7 +11993,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 157
               }
@@ -12050,11 +12050,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12083,7 +12085,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 160
                       }
@@ -12092,7 +12093,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12108,7 +12110,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 160
                       }
@@ -12127,7 +12128,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 160
               }
@@ -12172,11 +12172,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12186,7 +12188,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -12198,7 +12199,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => '  '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12240,7 +12242,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -12262,7 +12263,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 163
               }
@@ -12282,11 +12282,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12297,7 +12299,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '.'
                       },
@@ -12317,7 +12318,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 165
               }
@@ -12375,18 +12375,21 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'cite',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'cite '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'asis',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12396,7 +12399,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'asis',
                               'source_info' => {
                                 'line_nr' => 168
                               }
@@ -12405,7 +12407,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'cite',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12414,7 +12415,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12427,7 +12429,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'w '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'b',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12437,7 +12440,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'b',
                               'source_info' => {
                                 'line_nr' => 168
                               }
@@ -12446,7 +12448,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12455,7 +12456,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12465,7 +12467,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12474,7 +12475,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12484,7 +12486,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12493,7 +12494,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12503,7 +12505,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12512,7 +12513,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 't',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12522,7 +12524,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 't',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12531,7 +12532,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12541,7 +12543,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12550,7 +12551,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dfn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12560,7 +12562,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dfn',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12569,7 +12570,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'i',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12579,7 +12581,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'i',
                       'source_info' => {
                         'line_nr' => 168
                       }
@@ -12612,7 +12613,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 168
               }
@@ -12632,11 +12632,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12646,7 +12648,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12655,7 +12656,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12665,7 +12667,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12674,7 +12675,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12684,7 +12686,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12693,7 +12694,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12703,7 +12705,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12712,7 +12713,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12722,7 +12724,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12731,7 +12732,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'file',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12741,7 +12743,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'file',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12750,14 +12751,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'C-x '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'key',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -12767,7 +12770,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'key',
                               'source_info' => {
                                 'line_nr' => 170
                               }
@@ -12776,7 +12778,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 170
                       }
@@ -12805,7 +12806,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 170
               }
@@ -12825,14 +12825,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '8.27'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dmn',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12842,7 +12844,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dmn',
                       'source_info' => {
                         'line_nr' => 172
                       }
@@ -12860,7 +12861,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 172
               }
@@ -12880,11 +12880,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12894,7 +12896,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 174
                       }
@@ -12903,7 +12904,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'slanted',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12913,7 +12915,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'slanted',
                       'source_info' => {
                         'line_nr' => 174
                       }
@@ -12932,7 +12933,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 174
               }
@@ -12952,11 +12952,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'indicateurl',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -12966,7 +12968,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'indicateurl',
                       'source_info' => {
                         'line_nr' => 176
                       }
@@ -12983,7 +12984,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 176
               }
@@ -13003,11 +13003,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sub',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13017,7 +13019,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sub',
                       'source_info' => {
                         'line_nr' => 178
                       }
@@ -13026,7 +13027,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'H 3'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sup',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13036,7 +13038,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sup',
                       'source_info' => {
                         'line_nr' => 178
                       }
@@ -13055,7 +13056,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 178
               }
@@ -13075,11 +13075,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13089,7 +13091,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13098,7 +13099,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'url',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13121,7 +13123,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'url',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13130,7 +13131,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -13151,7 +13153,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 180
                       }
@@ -13172,7 +13173,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 180
               }
@@ -13447,238 +13447,238 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'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'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'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_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 9231f1c7dd..ededdbd1e8 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
@@ -806,7 +806,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -824,7 +825,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 33
@@ -835,7 +835,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -853,7 +854,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 34
@@ -864,7 +864,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -882,7 +883,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 35
@@ -893,7 +893,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -911,7 +912,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 36
@@ -922,7 +922,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -940,7 +941,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 37
@@ -1217,11 +1217,11 @@ 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'conte
 
$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'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'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'}[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];
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 914139ccb6..f526b009cf 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
@@ -129,7 +129,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -147,7 +148,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
                 'line_nr' => 8
@@ -453,7 +453,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3];
 
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 15f6dd53a7..b7aa5311e1 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
@@ -806,7 +806,8 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -824,7 +825,6 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
                 'line_nr' => 33
@@ -835,7 +835,8 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -853,7 +854,6 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
                 'line_nr' => 34
@@ -864,7 +864,8 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -882,7 +883,6 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
                 'line_nr' => 35
@@ -893,7 +893,8 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -911,7 +912,6 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
                 'line_nr' => 36
@@ -922,7 +922,8 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -940,7 +941,6 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_us_ascii_latin1_in_refs.texi',
                 'line_nr' => 37
@@ -1217,11 +1217,11 @@ 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'con
 
$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'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'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'}[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];
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 6d8d017bb6..20668fe967 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
@@ -806,7 +806,8 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -824,7 +825,6 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
                 'line_nr' => 33
@@ -835,7 +835,8 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -853,7 +854,6 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
                 'line_nr' => 34
@@ -864,7 +864,8 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -882,7 +883,6 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
                 'line_nr' => 35
@@ -893,7 +893,8 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -911,7 +912,6 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
                 'line_nr' => 36
@@ -922,7 +922,8 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -940,7 +941,6 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'char_utf8_latin1_in_refs.texi',
                 'line_nr' => 37
@@ -1217,11 +1217,11 @@ 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'content
 
$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'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'args'}[0]{'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'}[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];
diff --git 
a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl 
b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
index 61b30bbff6..110dfb7c63 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -51,7 +51,8 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               'text' => '-- --- \'\' `` ` \' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -70,7 +70,8 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -80,7 +81,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -117,7 +117,8 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'text' => '-- --- \'\' `` ` \' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -127,7 +128,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 6
                   }
@@ -136,7 +136,8 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'text' => '. '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -146,7 +147,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 6
                   }
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 fa77bc09e0..bd69ab182d 100644
--- a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
@@ -134,7 +134,8 @@ $result_trees{'dotless_argument_non_ascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,6 @@ $result_trees{'dotless_argument_non_ascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -154,7 +154,8 @@ $result_trees{'dotless_argument_non_ascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'dotless_argument_non_ascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'dotless',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'text' => ' '
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 18b441977e..e0ecd23fb0 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -240,12 +240,12 @@ $result_trees{'japanese_shift_jis'} = {
                   'text' => 'Copyright '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'copyright',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'copyright',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
                     'line_nr' => 12
@@ -266,7 +266,8 @@ $result_trees{'japanese_shift_jis'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -284,7 +285,6 @@ $result_trees{'japanese_shift_jis'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
                     'line_nr' => 14
@@ -305,7 +305,8 @@ $result_trees{'japanese_shift_jis'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -319,7 +320,6 @@ $result_trees{'japanese_shift_jis'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_shift_jis.texi',
                     'line_nr' => 18
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 03ec372f2e..4a51a82cc1 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
@@ -233,7 +233,8 @@ $result_trees{'manual_simple_latin1_with_error'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -242,8 +243,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         },
         {
           '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 ac3d543dae..a4b8d17a7d 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
@@ -194,7 +194,8 @@ $result_trees{'manual_simple_utf8_with_error'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -203,8 +204,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/multiple_include_encodings.pl 
b/tp/t/results/formats_encodings/multiple_include_encodings.pl
index 8e59976294..1cff233162 100644
--- a/tp/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tp/t/results/formats_encodings/multiple_include_encodings.pl
@@ -961,7 +961,8 @@ $result_trees{'multiple_include_encodings'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -979,7 +980,6 @@ $result_trees{'multiple_include_encodings'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'chapter_char_latin2_latin2_in_refs.texi',
                 'line_nr' => 6
@@ -1979,7 +1979,7 @@ $result_trees{'multiple_include_encodings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_include_encodings'}{'contents'}[12]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'multiple_include_encodings'}{'contents'}[11];
 
diff --git 
a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl 
b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
index 4b8f85866f..5a36a21b8c 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -20,7 +20,8 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               'text' => '-- --- \'\' `` ` \' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -39,7 +39,8 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -49,7 +50,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -86,7 +86,8 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'text' => '-- --- \'\' `` ` \' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -105,7 +105,8 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'text' => '. '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -115,7 +116,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 5
                   }
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 375686e393..91d9dac90e 100644
--- a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
+++ b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
@@ -134,7 +134,8 @@ $result_trees{'verb_delimiter_not_ascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -145,7 +146,6 @@ $result_trees{'verb_delimiter_not_ascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => "\x{ea}"
               },
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 4c17ff191d..8336abef90 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -177,15 +177,18 @@ $result_trees{'weird_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -195,7 +198,6 @@ $result_trees{'weird_accents'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -204,7 +206,6 @@ $result_trees{'weird_accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -213,7 +214,6 @@ $result_trees{'weird_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -233,15 +233,18 @@ $result_trees{'weird_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -251,7 +254,6 @@ $result_trees{'weird_accents'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -260,7 +262,6 @@ $result_trees{'weird_accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -269,7 +270,6 @@ $result_trees{'weird_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -289,11 +289,13 @@ $result_trees{'weird_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -303,7 +305,6 @@ $result_trees{'weird_accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -312,7 +313,6 @@ $result_trees{'weird_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -332,15 +332,18 @@ $result_trees{'weird_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '`',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -350,7 +353,6 @@ $result_trees{'weird_accents'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '`',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -359,7 +361,6 @@ $result_trees{'weird_accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -368,7 +369,6 @@ $result_trees{'weird_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -388,15 +388,18 @@ $result_trees{'weird_accents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '`',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -406,7 +409,6 @@ $result_trees{'weird_accents'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '`',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -415,7 +417,6 @@ $result_trees{'weird_accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -424,7 +425,6 @@ $result_trees{'weird_accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 17
               }
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 31eb2ef1be..25dd3afe28 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -177,15 +177,18 @@ $result_trees{'weird_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -195,7 +198,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -204,7 +206,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -213,7 +214,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -233,15 +233,18 @@ $result_trees{'weird_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -251,7 +254,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -260,7 +262,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -269,7 +270,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -289,11 +289,13 @@ $result_trees{'weird_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ubaraccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -303,7 +305,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ubaraccent',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -312,7 +313,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -332,15 +332,18 @@ $result_trees{'weird_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '`',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -350,7 +353,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '`',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -359,7 +361,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -368,7 +369,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -388,15 +388,18 @@ $result_trees{'weird_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '`',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -406,7 +409,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '`',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -415,7 +417,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -424,7 +425,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'line_nr' => 17
               }
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index c07f7ac31d..cf704bb13d 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -42,7 +42,8 @@ $result_trees{'heading_in_copying'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -52,7 +53,6 @@ $result_trees{'heading_in_copying'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -133,7 +133,8 @@ $result_trees{'heading_in_copying'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -143,7 +144,6 @@ $result_trees{'heading_in_copying'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 6
                       }
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index a16aad1ce0..21df6e773e 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -37,7 +37,8 @@ $result_trees{'heading_in_example'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -47,7 +48,6 @@ $result_trees{'heading_in_example'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 2
                       }
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 3e898b2bc2..10ef030994 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -42,7 +42,8 @@ $result_trees{'heading_in_quotation'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -52,7 +53,6 @@ $result_trees{'heading_in_quotation'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/html_tests/U_in_index.pl 
b/tp/t/results/html_tests/U_in_index.pl
index 683b96df10..05c5f2486f 100644
--- a/tp/t/results/html_tests/U_in_index.pl
+++ b/tp/t/results/html_tests/U_in_index.pl
@@ -137,7 +137,8 @@ $result_trees{'U_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'U',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -147,7 +148,6 @@ $result_trees{'U_in_index'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'U',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -194,7 +194,8 @@ $result_trees{'U_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'U',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -204,7 +205,6 @@ $result_trees{'U_in_index'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'U',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -251,7 +251,8 @@ $result_trees{'U_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'U',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -261,7 +262,6 @@ $result_trees{'U_in_index'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'U',
                   'source_info' => {
                     'line_nr' => 11
                   }
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 3ecaa4c2e4..42ea217960 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
@@ -202,7 +202,8 @@ $result_trees{'acronym_in_node_and_section'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -225,7 +226,6 @@ $result_trees{'acronym_in_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -263,7 +263,8 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'sec here is '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -273,7 +274,6 @@ $result_trees{'acronym_in_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -310,7 +310,8 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'here is '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -320,7 +321,6 @@ $result_trees{'acronym_in_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -348,7 +348,8 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'In text '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -358,7 +359,6 @@ $result_trees{'acronym_in_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 15
               }
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 94325c388d..ebf0cdcdc1 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -172,7 +172,8 @@ $result_trees{'anchor_on_vtable_item'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -182,7 +183,6 @@ $result_trees{'anchor_on_vtable_item'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'label1'
@@ -255,7 +255,8 @@ $result_trees{'anchor_on_vtable_item'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -265,7 +266,6 @@ $result_trees{'anchor_on_vtable_item'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'label2'
@@ -544,7 +544,8 @@ $result_trees{'anchor_on_vtable_item'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -562,7 +563,6 @@ $result_trees{'anchor_on_vtable_item'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -594,7 +594,7 @@ 
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[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_texis{'anchor_on_vtable_item'} = '@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 5254d671b2..1e6af99475 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
@@ -73,7 +73,8 @@ $result_trees{'base_for_css_info_in_init_test'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'base_for_css_info_in_init_test'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -103,11 +103,13 @@ $result_trees{'base_for_css_info_in_init_test'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -117,7 +119,6 @@ $result_trees{'base_for_css_info_in_init_test'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -126,7 +127,6 @@ $result_trees{'base_for_css_info_in_init_test'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -144,7 +144,8 @@ $result_trees{'base_for_css_info_in_init_test'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -154,7 +155,6 @@ $result_trees{'base_for_css_info_in_init_test'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 8
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index ef52fb9a7a..6a5d07dcbe 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -146,7 +146,8 @@ $result_trees{'check_htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -202,7 +203,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -212,7 +212,8 @@ $result_trees{'check_htmlxref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -268,7 +269,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -672,7 +672,8 @@ $result_trees{'check_htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -703,7 +704,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -734,8 +734,8 @@ $result_trees{'check_htmlxref'} = {
 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -743,8 +743,8 @@ 
$result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_conte
 
$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]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 0f4e9b79b1..97125a8372 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
@@ -146,7 +146,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -202,7 +203,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -212,7 +212,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -268,7 +269,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -672,7 +672,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -703,7 +704,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -734,8 +734,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -743,8 +743,8 @@ 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[1]{'ext
 
$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]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 5c1dc8225b..430c132ad2 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -154,7 +154,8 @@ $result_trees{'check_htmlxref_menu'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -210,7 +211,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -220,7 +220,8 @@ $result_trees{'check_htmlxref_menu'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -276,7 +277,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -680,7 +680,8 @@ $result_trees{'check_htmlxref_menu'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -711,7 +712,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -742,8 +742,8 @@ $result_trees{'check_htmlxref_menu'} = {
 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -751,8 +751,8 @@ 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_
 
$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]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 e4fc54380f..1e08c44929 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
@@ -154,7 +154,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -210,7 +211,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -220,7 +220,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -276,7 +277,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -680,7 +680,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -711,7 +712,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -742,8 +742,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -751,8 +751,8 @@ 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{
 
$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]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 47b85fc002..62e7a5272b 100644
--- a/tp/t/results/html_tests/command_in_node_redirection.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection.pl
@@ -54,7 +54,8 @@ $result_trees{'command_in_node_redirection'} = {
               'text' => 't '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'command_in_node_redirection'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,7 +87,8 @@ $result_trees{'command_in_node_redirection'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -97,7 +98,6 @@ $result_trees{'command_in_node_redirection'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'yyyy'
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 fc38cf0cac..eae2e2eb71 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
@@ -54,7 +54,8 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'text' => 't '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,7 +87,8 @@ $result_trees{'command_in_node_redirection_multiple'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -97,7 +98,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'yyyy'
@@ -117,11 +117,13 @@ $result_trees{'command_in_node_redirection_multiple'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sansserif',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -131,7 +133,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sansserif',
                   'source_info' => {
                     'line_nr' => 6
                   }
@@ -140,7 +141,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'gg'
@@ -160,11 +160,13 @@ $result_trees{'command_in_node_redirection_multiple'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -174,7 +176,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -183,7 +184,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'ancher'
@@ -203,11 +203,13 @@ $result_trees{'command_in_node_redirection_multiple'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sansserif',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -217,7 +219,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sansserif',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -226,7 +227,8 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -236,7 +238,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -245,7 +246,6 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'll-jj'
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 820c02e4a3..d3dfa78ed6 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
@@ -54,7 +54,8 @@ $result_trees{'command_in_node_redirection_other_command'} = {
               'text' => 't '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'command_in_node_redirection_other_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,11 +87,13 @@ $result_trees{'command_in_node_redirection_other_command'} 
= {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sansserif',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -101,7 +103,6 @@ $result_trees{'command_in_node_redirection_other_command'} 
= {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sansserif',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -110,7 +111,6 @@ $result_trees{'command_in_node_redirection_other_command'} 
= {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'gg'
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 7a35482073..458759d993 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
@@ -54,7 +54,8 @@ $result_trees{'command_in_node_redirection_same_command'} = {
               'text' => 't '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'command_in_node_redirection_same_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,11 +87,13 @@ $result_trees{'command_in_node_redirection_same_command'} = 
{
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -101,7 +103,6 @@ $result_trees{'command_in_node_redirection_same_command'} = 
{
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -110,7 +111,6 @@ $result_trees{'command_in_node_redirection_same_command'} = 
{
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'ancher'
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 536f4d2215..866f67ba85 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
@@ -54,7 +54,8 @@ $result_trees{'command_in_node_redirection_two_commands'} = {
               'text' => 't '
             },
             {
-              'args' => [
+              'cmdname' => 'r',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'command_in_node_redirection_two_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'r',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -87,11 +87,13 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sansserif',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -101,7 +103,6 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sansserif',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -110,7 +111,8 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -120,7 +122,6 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -129,7 +130,6 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'll-jj'
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index 622a31fb5e..9e6a8450a3 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -12,7 +12,8 @@ $result_trees{'commands_in_abbr'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -24,7 +25,8 @@ $result_trees{'commands_in_abbr'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -34,7 +36,6 @@ $result_trees{'commands_in_abbr'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -51,7 +52,6 @@ $result_trees{'commands_in_abbr'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -85,7 +85,8 @@ $result_trees{'commands_in_abbr'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'abbr',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -97,7 +98,8 @@ $result_trees{'commands_in_abbr'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -107,7 +109,6 @@ $result_trees{'commands_in_abbr'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -124,7 +125,6 @@ $result_trees{'commands_in_abbr'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'abbr',
                   'source_info' => {
                     'line_nr' => 4
                   }
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 5e3b91f301..bd017fb484 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -10,7 +10,8 @@ $result_trees{'commands_in_alt'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -31,7 +32,8 @@ $result_trees{'commands_in_alt'} = {
                   'text' => 'alt -- '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'b',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -41,7 +43,6 @@ $result_trees{'commands_in_alt'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'b',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -50,7 +51,6 @@ $result_trees{'commands_in_alt'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -84,7 +84,8 @@ $result_trees{'commands_in_alt'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -105,7 +106,8 @@ $result_trees{'commands_in_alt'} = {
                           'text' => 'alt -- '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'b',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -115,7 +117,6 @@ $result_trees{'commands_in_alt'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'b',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -124,7 +125,6 @@ $result_trees{'commands_in_alt'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
diff --git a/tp/t/results/html_tests/commands_in_email.pl 
b/tp/t/results/html_tests/commands_in_email.pl
index bd2bfc6901..8e25c25074 100644
--- a/tp/t/results/html_tests/commands_in_email.pl
+++ b/tp/t/results/html_tests/commands_in_email.pl
@@ -12,19 +12,20 @@ $result_trees{'commands_in_email'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'endots '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -33,7 +34,8 @@ $result_trees{'commands_in_email'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -43,7 +45,6 @@ $result_trees{'commands_in_email'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -52,7 +53,6 @@ $result_trees{'commands_in_email'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
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 75bfe50e1d..f7002d1232 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
@@ -73,7 +73,8 @@ $result_trees{'css_in_node_redirection_page'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'css_in_node_redirection_page'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -93,7 +93,8 @@ $result_trees{'css_in_node_redirection_page'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -103,7 +104,6 @@ $result_trees{'css_in_node_redirection_page'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'spot'
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 7bd41e5325..91a3f15058 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -29,7 +29,8 @@ $result_trees{'documentdescription'} = {
                   'text' => 'in '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -39,7 +40,6 @@ $result_trees{'documentdescription'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -48,12 +48,12 @@ $result_trees{'documentdescription'} = {
                   'text' => ' --- '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'bullet',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -62,12 +62,12 @@ $result_trees{'documentdescription'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -76,7 +76,8 @@ $result_trees{'documentdescription'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -87,7 +88,6 @@ $result_trees{'documentdescription'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -99,12 +99,12 @@ $result_trees{'documentdescription'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'aa',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'aa',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -113,11 +113,13 @@ $result_trees{'documentdescription'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -127,7 +129,6 @@ $result_trees{'documentdescription'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -136,7 +137,6 @@ $result_trees{'documentdescription'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -145,11 +145,13 @@ $result_trees{'documentdescription'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'email',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -159,7 +161,6 @@ $result_trees{'documentdescription'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -171,7 +172,6 @@ $result_trees{'documentdescription'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'email',
                   'source_info' => {
                     'line_nr' => 2
                   }
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 50aa0625f5..f9b5cf9703 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
@@ -51,7 +51,8 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -69,7 +70,6 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -140,7 +140,8 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -158,7 +159,6 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -189,8 +189,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'double_recursive_self_section_reference_node_no_use_node'} = 
'@node n1
 @chapter @ref{n2}
diff --git a/tp/t/results/html_tests/empty_titlefont.pl 
b/tp/t/results/html_tests/empty_titlefont.pl
index 78451a16e5..be26efdf34 100644
--- a/tp/t/results/html_tests/empty_titlefont.pl
+++ b/tp/t/results/html_tests/empty_titlefont.pl
@@ -15,12 +15,12 @@ $result_trees{'empty_titlefont'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 2
diff --git a/tp/t/results/html_tests/end_of_line_in_uref.pl 
b/tp/t/results/html_tests/end_of_line_in_uref.pl
index 5cecc92d30..bebe282a80 100644
--- a/tp/t/results/html_tests/end_of_line_in_uref.pl
+++ b/tp/t/results/html_tests/end_of_line_in_uref.pl
@@ -15,7 +15,8 @@ $result_trees{'end_of_line_in_uref'} = {
               'text' => 'See the '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -42,7 +43,6 @@ $result_trees{'end_of_line_in_uref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 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 778b7a51dc..a6cb9961a7 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
@@ -137,7 +137,8 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -147,7 +148,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'fOO'
@@ -373,7 +373,8 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -391,7 +392,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -411,7 +411,8 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -429,7 +430,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -457,8 +457,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 2965e3aeeb..4e7c36adcb 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
@@ -137,7 +137,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -147,7 +148,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'fOO'
@@ -373,7 +373,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -391,7 +392,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -411,7 +411,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -429,7 +430,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -457,8 +457,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 b669449cc9..efb5695364 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
@@ -174,7 +174,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -184,7 +185,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'foo'
@@ -204,7 +204,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'text' => 'Some text about '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -214,7 +215,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'samp',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -274,7 +274,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -284,7 +285,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Foo'
@@ -304,7 +304,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                           'text' => 'Some text about '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -314,7 +315,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'samp',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -388,7 +388,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -406,7 +407,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -426,7 +426,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -444,7 +445,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -473,8 +473,8 @@ 
$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]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[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_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 bdb69cd604..13e94b815b 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
@@ -137,7 +137,8 @@ $result_trees{'file_name_conflict_with_Top'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -147,7 +148,6 @@ $result_trees{'file_name_conflict_with_Top'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'index'
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 7cf53bf9b0..95189f34a4 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
@@ -66,7 +66,8 @@ $result_trees{'file_name_conflict_with_section'} = {
       'cmdname' => 'top',
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -76,7 +77,6 @@ $result_trees{'file_name_conflict_with_section'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'Chap'
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 094155c300..a648dc1aae 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
@@ -137,7 +137,8 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -147,7 +148,6 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'myanchor'
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index beb29c2d56..147088d29a 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -71,7 +71,8 @@ $result_trees{'filenameconflictwithnonsplit'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -81,7 +82,6 @@ $result_trees{'filenameconflictwithnonsplit'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'filenameconflictwithnonsplit'
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index 5670564077..b332f8efad 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -73,7 +73,8 @@ $result_trees{'filenameconflictwithspecialelement'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -88,7 +89,6 @@ $result_trees{'filenameconflictwithspecialelement'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -187,7 +187,8 @@ $result_trees{'filenameconflictwithspecialelement'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -197,7 +198,6 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'filenameconflictwithspecialelement-fot'
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index de2a774665..144384f1a2 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -140,7 +140,8 @@ $result_trees{'float_copying'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'caption',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -149,7 +150,8 @@ $result_trees{'float_copying'} = {
                                   'text' => 'The Public Domain notice'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'footnote',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -159,7 +161,8 @@ $result_trees{'float_copying'} = {
 '
                                             },
                                             {
-                                              'args' => [
+                                              'cmdname' => 'anchor',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -172,7 +175,6 @@ $result_trees{'float_copying'} = {
                                                   'type' => 'brace_arg'
                                                 }
                                               ],
-                                              'cmdname' => 'anchor',
                                               'extra' => {
                                                 'is_target' => 1,
                                                 'normalized' => 
'caption-copying-footnote-anchor'
@@ -280,7 +282,8 @@ $result_trees{'float_copying'} = {
                                               'text' => 'see '
                                             },
                                             {
-                                              'args' => [
+                                              'cmdname' => 'ref',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -298,7 +301,6 @@ $result_trees{'float_copying'} = {
                                                   'type' => 'brace_arg'
                                                 }
                                               ],
-                                              'cmdname' => 'ref',
                                               'source_info' => {
                                                 'file_name' => 
'float_copying.texi',
                                                 'line_nr' => 19
@@ -320,7 +322,6 @@ $result_trees{'float_copying'} = {
                                       'type' => 'brace_command_context'
                                     }
                                   ],
-                                  'cmdname' => 'footnote',
                                   'extra' => {},
                                   'info' => {
                                     'spaces_before_argument' => {
@@ -346,7 +347,8 @@ $result_trees{'float_copying'} = {
                               'type' => 'empty_line'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -359,7 +361,6 @@ $result_trees{'float_copying'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'public-domain-anchor'
@@ -452,7 +453,6 @@ $result_trees{'float_copying'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'caption',
                       'extra' => {
                         'float' => {}
                       },
@@ -666,7 +666,8 @@ $result_trees{'float_copying'} = {
               'text' => 'See the caption '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -684,7 +685,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 35
@@ -708,7 +708,8 @@ $result_trees{'float_copying'} = {
               'text' => 'See the float '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -726,7 +727,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 37
@@ -960,7 +960,8 @@ $result_trees{'float_copying'} = {
               'text' => 'See the caption '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -978,7 +979,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 51
@@ -1002,7 +1002,8 @@ $result_trees{'float_copying'} = {
               'text' => 'See the float '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1020,7 +1021,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 53
@@ -1307,15 +1307,15 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'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'}[1]{'contents'}[3]{'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'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'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_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 d4cebfc38f..ecc594fb1b 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
@@ -105,7 +105,8 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'text' => 'In top'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -120,7 +121,6 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 378a01ea07..c05c3a57c0 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -147,7 +147,8 @@ $result_trees{'footnotestyle_separate_late'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => 'footnote',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -162,7 +163,6 @@ $result_trees{'footnotestyle_separate_late'} = [
                     'type' => 'brace_command_context'
                   }
                 ],
-                'cmdname' => 'footnote',
                 'extra' => {},
                 'source_info' => {
                   'line_nr' => 7
@@ -257,7 +257,8 @@ $result_trees{'footnotestyle_separate_late'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => 'footnote',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -272,7 +273,6 @@ $result_trees{'footnotestyle_separate_late'} = [
                     'type' => 'brace_command_context'
                   }
                 ],
-                'cmdname' => 'footnote',
                 'extra' => {},
                 'source_info' => {
                   'line_nr' => 12
diff --git a/tp/t/results/html_tests/fractions_rounding.pl 
b/tp/t/results/html_tests/fractions_rounding.pl
index 78dc754075..8e642110c5 100644
--- a/tp/t/results/html_tests/fractions_rounding.pl
+++ b/tp/t/results/html_tests/fractions_rounding.pl
@@ -169,7 +169,8 @@ $result_trees{'fractions_rounding'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -182,7 +183,6 @@ $result_trees{'fractions_rounding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -211,7 +211,8 @@ $result_trees{'fractions_rounding'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -224,7 +225,6 @@ $result_trees{'fractions_rounding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -253,7 +253,8 @@ $result_trees{'fractions_rounding'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -266,7 +267,6 @@ $result_trees{'fractions_rounding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -295,7 +295,8 @@ $result_trees{'fractions_rounding'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -308,7 +309,6 @@ $result_trees{'fractions_rounding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
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 dd5621613a..b633bc26fd 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -249,7 +249,8 @@ $result_trees{'headings_after_lone_nodes'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -259,7 +260,6 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'toto'
diff --git a/tp/t/results/html_tests/image_link_prefix.pl 
b/tp/t/results/html_tests/image_link_prefix.pl
index 5aca9e10e0..2dc7d6236c 100644
--- a/tp/t/results/html_tests/image_link_prefix.pl
+++ b/tp/t/results/html_tests/image_link_prefix.pl
@@ -10,7 +10,8 @@ $result_trees{'image_link_prefix'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'image_link_prefix'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/html_tests/inline_in_node.pl 
b/tp/t/results/html_tests/inline_in_node.pl
index 31fcead126..2bf591e731 100644
--- a/tp/t/results/html_tests/inline_in_node.pl
+++ b/tp/t/results/html_tests/inline_in_node.pl
@@ -16,7 +16,8 @@ $result_trees{'inline_in_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'inlineraw',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -34,7 +35,6 @@ $result_trees{'inline_in_node'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'inlineraw',
                       'extra' => {
                         'expand_index' => 1,
                         'format' => 'html'
@@ -47,7 +47,8 @@ $result_trees{'inline_in_node'} = {
                       'text' => 'Title'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'inlineraw',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +66,6 @@ $result_trees{'inline_in_node'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'inlineraw',
                       'extra' => {
                         'expand_index' => 1,
                         'format' => 'html'
@@ -166,7 +166,8 @@ $result_trees{'inline_in_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'inline_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -197,7 +197,8 @@ $result_trees{'inline_in_node'} = {
               'text' => 'One'
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +216,6 @@ $result_trees{'inline_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -253,7 +253,8 @@ $result_trees{'inline_in_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -271,7 +272,6 @@ $result_trees{'inline_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -284,7 +284,8 @@ $result_trees{'inline_in_node'} = {
               'text' => 'One'
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -302,7 +303,6 @@ $result_trees{'inline_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index 9c29684437..72d34ca936 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -203,7 +203,8 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -213,7 +214,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -243,7 +243,8 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item code '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -253,7 +254,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -617,12 +617,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item today '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 27
                       }
@@ -695,12 +695,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'aa',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'aa',
                   'source_info' => {
                     'line_nr' => 30
                   }
@@ -709,16 +709,17 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'aa',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'aa',
                           'source_info' => {
                             'line_nr' => 30
                           }
@@ -727,7 +728,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 30
                   }
@@ -757,12 +757,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item aa '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -771,16 +771,17 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -789,7 +790,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -859,12 +859,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tie',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tie',
                   'source_info' => {
                     'line_nr' => 34
                   }
@@ -894,12 +894,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item tie '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 35
                       }
@@ -972,12 +972,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tie',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tie',
                   'source_info' => {
                     'line_nr' => 38
                   }
@@ -1010,12 +1010,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item tie '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 39
                       }
@@ -1179,12 +1179,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'atchar',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'atchar',
                   'source_info' => {
                     'line_nr' => 46
                   }
@@ -1217,12 +1217,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item atchar '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 47
                       }
@@ -1604,12 +1604,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ampchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ampchar',
                       'source_info' => {
                         'line_nr' => 63
                       }
@@ -1779,12 +1779,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ampchar',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ampchar',
                   'source_info' => {
                     'line_nr' => 70
                   }
@@ -1817,12 +1817,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ampchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ampchar',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -1892,12 +1892,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'line_nr' => 74
                   }
@@ -1927,12 +1927,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item registeredsymbol '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 75
                       }
@@ -2005,12 +2005,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'line_nr' => 78
                   }
@@ -2043,12 +2043,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item registeredsymbol '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 79
                       }
@@ -2118,12 +2118,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 82
                   }
@@ -2153,12 +2153,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item dots '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 83
                       }
@@ -2231,12 +2231,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 86
                   }
@@ -2269,12 +2269,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item dots '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 87
                       }
@@ -2344,7 +2344,8 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2354,7 +2355,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 90
                   }
@@ -2363,11 +2363,13 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2377,7 +2379,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 90
                           }
@@ -2386,7 +2387,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 90
                   }
@@ -2416,7 +2416,8 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item e '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2426,7 +2427,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 91
                       }
@@ -2435,11 +2435,13 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2449,7 +2451,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 91
                               }
@@ -2458,7 +2459,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 91
                       }
@@ -2528,7 +2528,8 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2538,7 +2539,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 94
                   }
@@ -2547,11 +2547,13 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2561,7 +2563,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 94
                           }
@@ -2570,7 +2571,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 94
                   }
@@ -2600,7 +2600,8 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item E '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2610,7 +2611,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 95
                       }
@@ -2619,11 +2619,13 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2633,7 +2635,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -2642,7 +2643,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 95
                       }
@@ -2712,11 +2712,13 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2726,7 +2728,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2735,7 +2736,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2744,7 +2744,8 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2754,7 +2755,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2763,15 +2763,18 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '~',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'dotless',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -2781,7 +2784,6 @@ $result_trees{'itemize_arguments'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'dotless',
                                   'source_info' => {
                                     'line_nr' => 98
                                   }
@@ -2790,7 +2792,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '~',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2799,7 +2800,8 @@ $result_trees{'itemize_arguments'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2809,7 +2811,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2818,7 +2819,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2848,11 +2848,13 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item dotless '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2862,7 +2864,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2871,7 +2872,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -2880,7 +2880,8 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2890,7 +2891,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -2899,15 +2899,18 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'dotless',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2917,7 +2920,6 @@ $result_trees{'itemize_arguments'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'dotless',
                                       'source_info' => {
                                         'line_nr' => 99
                                       }
@@ -2926,7 +2928,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2935,7 +2936,8 @@ $result_trees{'itemize_arguments'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2945,7 +2947,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2954,7 +2955,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -3024,7 +3024,8 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'udotaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -3034,7 +3035,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'udotaccent',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3043,11 +3043,13 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'v',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3057,7 +3059,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3066,7 +3067,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'v',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3075,11 +3075,13 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'udotaccent',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3089,7 +3091,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'udotaccent',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3098,11 +3099,13 @@ $result_trees{'itemize_arguments'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'v',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '\'',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -3112,7 +3115,6 @@ $result_trees{'itemize_arguments'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '\'',
                                   'source_info' => {
                                     'line_nr' => 102
                                   }
@@ -3121,7 +3123,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'v',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3130,7 +3131,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3160,7 +3160,8 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item complex a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3170,7 +3171,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3179,11 +3179,13 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3193,7 +3195,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3202,7 +3203,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3211,11 +3211,13 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'udotaccent',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3225,7 +3227,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'udotaccent',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3234,11 +3235,13 @@ $result_trees{'itemize_arguments'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'v',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '\'',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3248,7 +3251,6 @@ $result_trees{'itemize_arguments'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '\'',
                                       'source_info' => {
                                         'line_nr' => 103
                                       }
@@ -3257,7 +3259,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'v',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3266,7 +3267,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3336,15 +3336,18 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '=',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => ',',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '~',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -3354,7 +3357,6 @@ $result_trees{'itemize_arguments'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '~',
                                   'source_info' => {
                                     'line_nr' => 106
                                   }
@@ -3363,7 +3365,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => ',',
                           'source_info' => {
                             'line_nr' => 106
                           }
@@ -3372,7 +3373,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '=',
                   'source_info' => {
                     'line_nr' => 106
                   }
@@ -3381,22 +3381,26 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '=',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => ',',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => '~',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -3406,7 +3410,6 @@ $result_trees{'itemize_arguments'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '~',
                                           'source_info' => {
                                             'line_nr' => 106
                                           }
@@ -3415,7 +3418,6 @@ $result_trees{'itemize_arguments'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => ',',
                                   'source_info' => {
                                     'line_nr' => 106
                                   }
@@ -3424,7 +3426,6 @@ $result_trees{'itemize_arguments'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '=',
                           'source_info' => {
                             'line_nr' => 106
                           }
@@ -3433,7 +3434,6 @@ $result_trees{'itemize_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 106
                   }
@@ -3463,15 +3463,18 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item complex n '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3481,7 +3484,6 @@ $result_trees{'itemize_arguments'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'line_nr' => 107
                                       }
@@ -3490,7 +3492,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -3499,7 +3500,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -3508,22 +3508,26 @@ $result_trees{'itemize_arguments'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => ',',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => '~',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -3533,7 +3537,6 @@ $result_trees{'itemize_arguments'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => '~',
                                               'source_info' => {
                                                 'line_nr' => 107
                                               }
@@ -3542,7 +3545,6 @@ $result_trees{'itemize_arguments'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => ',',
                                       'source_info' => {
                                         'line_nr' => 107
                                       }
@@ -3551,7 +3553,6 @@ $result_trees{'itemize_arguments'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -3560,7 +3561,6 @@ $result_trees{'itemize_arguments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -3660,12 +3660,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item asis '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 111
                       }
@@ -3738,12 +3738,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'arrow'
                   },
@@ -3776,12 +3776,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'arrow'
                       },
@@ -3857,12 +3857,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'arrow'
                   },
@@ -3898,12 +3898,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'arrow'
                       },
@@ -3998,12 +3998,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'result'
                   },
@@ -4036,12 +4036,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item result click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'result'
                       },
@@ -4117,12 +4117,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'result'
                   },
@@ -4158,12 +4158,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item result click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'result'
                       },
@@ -4236,12 +4236,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 132
                   }
@@ -4271,12 +4271,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -4349,12 +4349,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 136
                   }
@@ -4387,12 +4387,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -4492,12 +4492,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 141
                   }
@@ -4527,12 +4527,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item fr error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -4605,12 +4605,12 @@ $result_trees{'itemize_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 145
                   }
@@ -4643,12 +4643,12 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'item fr error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 146
                       }
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl 
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 89e294063a..0e5bb0b694 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -203,7 +203,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -213,7 +214,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -243,7 +243,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item code '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -253,7 +254,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -617,12 +617,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item today '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 27
                       }
@@ -695,12 +695,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'aa',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'aa',
                   'source_info' => {
                     'line_nr' => 30
                   }
@@ -709,16 +709,17 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'aa',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'aa',
                           'source_info' => {
                             'line_nr' => 30
                           }
@@ -727,7 +728,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 30
                   }
@@ -757,12 +757,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item aa '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -771,16 +771,17 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 31
                               }
@@ -789,7 +790,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 31
                       }
@@ -859,12 +859,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tie',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tie',
                   'source_info' => {
                     'line_nr' => 34
                   }
@@ -894,12 +894,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item tie '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 35
                       }
@@ -972,12 +972,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tie',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tie',
                   'source_info' => {
                     'line_nr' => 38
                   }
@@ -1010,12 +1010,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item tie '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tie',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tie',
                       'source_info' => {
                         'line_nr' => 39
                       }
@@ -1179,12 +1179,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'atchar',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'atchar',
                   'source_info' => {
                     'line_nr' => 46
                   }
@@ -1217,12 +1217,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item atchar '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'atchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'atchar',
                       'source_info' => {
                         'line_nr' => 47
                       }
@@ -1604,12 +1604,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ampchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ampchar',
                       'source_info' => {
                         'line_nr' => 63
                       }
@@ -1779,12 +1779,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ampchar',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ampchar',
                   'source_info' => {
                     'line_nr' => 70
                   }
@@ -1817,12 +1817,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ampchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ampchar',
                       'source_info' => {
                         'line_nr' => 71
                       }
@@ -1892,12 +1892,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'line_nr' => 74
                   }
@@ -1927,12 +1927,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item registeredsymbol '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 75
                       }
@@ -2005,12 +2005,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'registeredsymbol',
                   'source_info' => {
                     'line_nr' => 78
                   }
@@ -2043,12 +2043,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item registeredsymbol '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'registeredsymbol',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'registeredsymbol',
                       'source_info' => {
                         'line_nr' => 79
                       }
@@ -2118,12 +2118,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 82
                   }
@@ -2153,12 +2153,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item dots '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 83
                       }
@@ -2231,12 +2231,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 86
                   }
@@ -2269,12 +2269,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item dots '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'enddots',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'enddots',
                       'source_info' => {
                         'line_nr' => 87
                       }
@@ -2344,7 +2344,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2354,7 +2355,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 90
                   }
@@ -2363,11 +2363,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2377,7 +2379,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 90
                           }
@@ -2386,7 +2387,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 90
                   }
@@ -2416,7 +2416,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item e '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2426,7 +2427,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 91
                       }
@@ -2435,11 +2435,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2449,7 +2451,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 91
                               }
@@ -2458,7 +2459,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 91
                       }
@@ -2528,7 +2528,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2538,7 +2539,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 94
                   }
@@ -2547,11 +2547,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2561,7 +2563,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 94
                           }
@@ -2570,7 +2571,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 94
                   }
@@ -2600,7 +2600,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item E '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2610,7 +2611,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 95
                       }
@@ -2619,11 +2619,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2633,7 +2635,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 95
                               }
@@ -2642,7 +2643,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 95
                       }
@@ -2712,11 +2712,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2726,7 +2728,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2735,7 +2736,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2744,7 +2744,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2754,7 +2755,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2763,15 +2763,18 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '~',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'dotless',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -2781,7 +2784,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'dotless',
                                   'source_info' => {
                                     'line_nr' => 98
                                   }
@@ -2790,7 +2792,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '~',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2799,7 +2800,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -2809,7 +2811,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 98
                           }
@@ -2818,7 +2819,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 98
                   }
@@ -2848,11 +2848,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item dotless '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2862,7 +2864,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2871,7 +2872,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -2880,7 +2880,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -2890,7 +2891,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -2899,15 +2899,18 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'dotless',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -2917,7 +2920,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'dotless',
                                       'source_info' => {
                                         'line_nr' => 99
                                       }
@@ -2926,7 +2928,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2935,7 +2936,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -2945,7 +2947,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 99
                               }
@@ -2954,7 +2955,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 99
                       }
@@ -3024,7 +3024,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'udotaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -3034,7 +3035,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'udotaccent',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3043,11 +3043,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'v',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3057,7 +3059,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3066,7 +3067,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'v',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3075,11 +3075,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'udotaccent',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -3089,7 +3091,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'udotaccent',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3098,11 +3099,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'v',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '\'',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -3112,7 +3115,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '\'',
                                   'source_info' => {
                                     'line_nr' => 102
                                   }
@@ -3121,7 +3123,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'v',
                           'source_info' => {
                             'line_nr' => 102
                           }
@@ -3130,7 +3131,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 102
                   }
@@ -3160,7 +3160,8 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item complex a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -3170,7 +3171,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3179,11 +3179,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3193,7 +3195,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3202,7 +3203,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3211,11 +3211,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'udotaccent',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -3225,7 +3227,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'udotaccent',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3234,11 +3235,13 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'v',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '\'',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3248,7 +3251,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '\'',
                                       'source_info' => {
                                         'line_nr' => 103
                                       }
@@ -3257,7 +3259,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'v',
                               'source_info' => {
                                 'line_nr' => 103
                               }
@@ -3266,7 +3267,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 103
                       }
@@ -3336,15 +3336,18 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '=',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => ',',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => '~',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -3354,7 +3357,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => '~',
                                   'source_info' => {
                                     'line_nr' => 106
                                   }
@@ -3363,7 +3365,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => ',',
                           'source_info' => {
                             'line_nr' => 106
                           }
@@ -3372,7 +3373,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '=',
                   'source_info' => {
                     'line_nr' => 106
                   }
@@ -3381,22 +3381,26 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => ' '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '=',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => ',',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => '~',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -3406,7 +3410,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                               'type' => 'brace_container'
                                             }
                                           ],
-                                          'cmdname' => '~',
                                           'source_info' => {
                                             'line_nr' => 106
                                           }
@@ -3415,7 +3418,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => ',',
                                   'source_info' => {
                                     'line_nr' => 106
                                   }
@@ -3424,7 +3426,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '=',
                           'source_info' => {
                             'line_nr' => 106
                           }
@@ -3433,7 +3434,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 106
                   }
@@ -3463,15 +3463,18 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item complex n '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -3481,7 +3484,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'line_nr' => 107
                                       }
@@ -3490,7 +3492,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -3499,7 +3500,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -3508,22 +3508,26 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => '=',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => ',',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
-                                              'args' => [
+                                              'cmdname' => '~',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -3533,7 +3537,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                                   'type' => 'brace_container'
                                                 }
                                               ],
-                                              'cmdname' => '~',
                                               'source_info' => {
                                                 'line_nr' => 107
                                               }
@@ -3542,7 +3545,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => ',',
                                       'source_info' => {
                                         'line_nr' => 107
                                       }
@@ -3551,7 +3553,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '=',
                               'source_info' => {
                                 'line_nr' => 107
                               }
@@ -3560,7 +3561,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 107
                       }
@@ -3660,12 +3660,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item asis '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 111
                       }
@@ -3738,12 +3738,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'arrow'
                   },
@@ -3776,12 +3776,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'arrow'
                       },
@@ -3857,12 +3857,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'arrow'
                   },
@@ -3898,12 +3898,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'arrow'
                       },
@@ -3998,12 +3998,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'result'
                   },
@@ -4036,12 +4036,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item result click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'result'
                       },
@@ -4117,12 +4117,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'click',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'click',
                   'extra' => {
                     'clickstyle' => 'result'
                   },
@@ -4158,12 +4158,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item result click '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'click',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'click',
                       'extra' => {
                         'clickstyle' => 'result'
                       },
@@ -4236,12 +4236,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 132
                   }
@@ -4271,12 +4271,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 133
                       }
@@ -4349,12 +4349,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 136
                   }
@@ -4387,12 +4387,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 137
                       }
@@ -4492,12 +4492,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 141
                   }
@@ -4527,12 +4527,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item fr error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 142
                       }
@@ -4605,12 +4605,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'error',
                   'source_info' => {
                     'line_nr' => 145
                   }
@@ -4643,12 +4643,12 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'item fr error '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 146
                       }
diff --git a/tp/t/results/html_tests/itemize_tieaccent.pl 
b/tp/t/results/html_tests/itemize_tieaccent.pl
index 32af19b787..58888662c5 100644
--- a/tp/t/results/html_tests/itemize_tieaccent.pl
+++ b/tp/t/results/html_tests/itemize_tieaccent.pl
@@ -17,7 +17,8 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -57,7 +57,8 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -67,7 +68,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -137,22 +137,24 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'aa',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'aa',
                           'source_info' => {
                             'line_nr' => 5
                           }
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -162,7 +164,6 @@ $result_trees{'itemize_tieaccent'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 5
                           }
@@ -171,7 +172,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -201,22 +201,24 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 6
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -226,7 +228,6 @@ $result_trees{'itemize_tieaccent'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 6
                               }
@@ -235,7 +236,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -305,16 +305,17 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'aa',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'aa',
                           'source_info' => {
                             'line_nr' => 9
                           }
@@ -326,7 +327,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -356,16 +356,17 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'aa',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'aa',
                               'source_info' => {
                                 'line_nr' => 10
                               }
@@ -377,7 +378,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -447,14 +447,16 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'x'
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -464,7 +466,6 @@ $result_trees{'itemize_tieaccent'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 13
                           }
@@ -473,7 +474,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -503,14 +503,16 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'x'
                             },
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -520,7 +522,6 @@ $result_trees{'itemize_tieaccent'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 14
                               }
@@ -529,7 +530,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 14
                       }
@@ -599,7 +599,8 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -609,7 +610,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -639,7 +639,8 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -649,7 +650,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 18
                       }
@@ -719,11 +719,13 @@ $result_trees{'itemize_tieaccent'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'tieaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -733,7 +735,6 @@ $result_trees{'itemize_tieaccent'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'line_nr' => 21
                           }
@@ -742,7 +743,6 @@ $result_trees{'itemize_tieaccent'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'tieaccent',
                   'source_info' => {
                     'line_nr' => 21
                   }
@@ -772,11 +772,13 @@ $result_trees{'itemize_tieaccent'} = {
                       'text' => 'item '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'tieaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '^',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -786,7 +788,6 @@ $result_trees{'itemize_tieaccent'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '^',
                               'source_info' => {
                                 'line_nr' => 22
                               }
@@ -795,7 +796,6 @@ $result_trees{'itemize_tieaccent'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'tieaccent',
                       'source_info' => {
                         'line_nr' => 22
                       }
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 03b77a34d1..82b913be03 100644
--- a/tp/t/results/html_tests/letter_command_in_index.pl
+++ b/tp/t/results/html_tests/letter_command_in_index.pl
@@ -137,12 +137,12 @@ $result_trees{'letter_command_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -186,12 +186,12 @@ $result_trees{'letter_command_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -235,7 +235,8 @@ $result_trees{'letter_command_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,7 +246,6 @@ $result_trees{'letter_command_in_index'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index 74f477527b..10b551c30a 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -27,7 +27,8 @@ $result_trees{'mathjax_with_texinfo'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,12 +51,12 @@ $result_trees{'mathjax_with_texinfo'} = {
                           'text' => '{phi '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'copyright',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'copyright',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -73,7 +74,6 @@ $result_trees{'mathjax_with_texinfo'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -82,7 +82,8 @@ $result_trees{'mathjax_with_texinfo'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'mathjax_with_texinfo'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -147,19 +147,20 @@ $result_trees{'mathjax_with_texinfo'} = {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -168,12 +169,12 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -182,12 +183,12 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -196,7 +197,8 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -206,7 +208,6 @@ $result_trees{'mathjax_with_texinfo'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -215,7 +216,6 @@ $result_trees{'mathjax_with_texinfo'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
index addae9c0a7..229fb570c1 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
@@ -30,7 +30,8 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,12 +54,12 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                           'text' => '{phi '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'copyright',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'copyright',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -76,7 +77,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -85,7 +85,8 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -95,7 +96,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -150,19 +150,20 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -171,12 +172,12 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -185,12 +186,12 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -199,7 +200,8 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -209,7 +211,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -218,7 +219,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
index 12a0f04519..f9c800fd90 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_file.pl
@@ -30,7 +30,8 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,12 +54,12 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                           'text' => '{phi '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'copyright',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'copyright',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -76,7 +77,6 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -85,7 +85,8 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -95,7 +96,6 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -150,19 +150,20 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -171,12 +172,12 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -185,12 +186,12 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -199,7 +200,8 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -209,7 +211,6 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -218,7 +219,6 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
index 8c0ae05a99..cdbb879601 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
@@ -27,7 +27,8 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,12 +51,12 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                           'text' => '{phi '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'copyright',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'copyright',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -73,7 +74,6 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -82,7 +82,8 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -147,19 +147,20 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -168,12 +169,12 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -182,12 +183,12 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -196,7 +197,8 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -206,7 +208,6 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -215,7 +216,6 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git 
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index 9c88ac2c2a..c4ab733d97 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -27,7 +27,8 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'sup',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,12 +51,12 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                           'text' => '{phi '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'copyright',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'copyright',
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -73,7 +74,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sup',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -82,7 +82,8 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -147,19 +147,20 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} 
= {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'a '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -168,12 +169,12 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} 
= {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'geq',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'geq',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -182,12 +183,12 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -196,7 +197,8 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -206,7 +208,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -215,7 +216,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/no_use_iso.pl 
b/tp/t/results/html_tests/no_use_iso.pl
index 8f7ec671ec..fa9f19bbc5 100644
--- a/tp/t/results/html_tests/no_use_iso.pl
+++ b/tp/t/results/html_tests/no_use_iso.pl
@@ -15,7 +15,8 @@ $result_trees{'no_use_iso'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'no_use_iso'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index 571523ffe2..6c9713c163 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -94,7 +94,8 @@ $result_trees{'node_footnote_end'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -104,7 +105,6 @@ $result_trees{'node_footnote_end'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 8
@@ -155,7 +155,8 @@ $result_trees{'node_footnote_end'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -165,7 +166,6 @@ $result_trees{'node_footnote_end'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 9
@@ -263,7 +263,8 @@ $result_trees{'node_footnote_end'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -273,7 +274,6 @@ $result_trees{'node_footnote_end'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 11
@@ -377,7 +377,8 @@ $result_trees{'node_footnote_end'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -387,7 +388,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 14
@@ -416,7 +416,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +427,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 16
@@ -440,7 +440,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'Footnote 1'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,8 @@ $result_trees{'node_footnote_end'} = {
                           'text' => 'foot 1 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -459,7 +461,6 @@ $result_trees{'node_footnote_end'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 17
@@ -472,7 +473,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -511,7 +511,8 @@ $result_trees{'node_footnote_end'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 19
@@ -550,7 +550,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -560,7 +561,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 21
@@ -574,7 +574,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'Footnote 2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -583,7 +584,8 @@ $result_trees{'node_footnote_end'} = {
                           'text' => 'foot 2 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -593,7 +595,6 @@ $result_trees{'node_footnote_end'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 22
@@ -606,7 +607,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -719,7 +719,8 @@ $result_trees{'node_footnote_end'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -729,7 +730,6 @@ $result_trees{'node_footnote_end'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 28
@@ -832,7 +832,8 @@ $result_trees{'node_footnote_end'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -842,7 +843,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 31
@@ -871,7 +871,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 33
@@ -895,7 +895,8 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'Footnote 3'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -904,7 +905,8 @@ $result_trees{'node_footnote_end'} = {
                           'text' => 'foot 3 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -914,7 +916,6 @@ $result_trees{'node_footnote_end'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 34
@@ -927,7 +928,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index bccdedee32..3d85e1a274 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -94,7 +94,8 @@ $result_trees{'node_footnote_separated'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -104,7 +105,6 @@ $result_trees{'node_footnote_separated'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 8
@@ -155,7 +155,8 @@ $result_trees{'node_footnote_separated'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -165,7 +166,6 @@ $result_trees{'node_footnote_separated'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 9
@@ -263,7 +263,8 @@ $result_trees{'node_footnote_separated'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -273,7 +274,6 @@ $result_trees{'node_footnote_separated'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 11
@@ -377,7 +377,8 @@ $result_trees{'node_footnote_separated'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -387,7 +388,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 14
@@ -416,7 +416,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +427,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 16
@@ -440,7 +440,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'Footnote 1'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,8 @@ $result_trees{'node_footnote_separated'} = {
                           'text' => 'foot 1 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -459,7 +461,6 @@ $result_trees{'node_footnote_separated'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 17
@@ -472,7 +473,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -511,7 +511,8 @@ $result_trees{'node_footnote_separated'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 19
@@ -550,7 +550,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -560,7 +561,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 21
@@ -574,7 +574,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'Footnote 2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -583,7 +584,8 @@ $result_trees{'node_footnote_separated'} = {
                           'text' => 'foot 2 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -593,7 +595,6 @@ $result_trees{'node_footnote_separated'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 22
@@ -606,7 +607,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -719,7 +719,8 @@ $result_trees{'node_footnote_separated'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -729,7 +730,6 @@ $result_trees{'node_footnote_separated'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 28
@@ -832,7 +832,8 @@ $result_trees{'node_footnote_separated'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -842,7 +843,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 31
@@ -871,7 +871,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 33
@@ -895,7 +895,8 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'Footnote 3'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -904,7 +905,8 @@ $result_trees{'node_footnote_separated'} = {
                           'text' => 'foot 3 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -914,7 +916,6 @@ $result_trees{'node_footnote_separated'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 34
@@ -927,7 +928,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
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 c85de28fc8..432bbd3d4c 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -94,7 +94,8 @@ $result_trees{'node_footnote_use_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -104,7 +105,6 @@ $result_trees{'node_footnote_use_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 8
@@ -155,7 +155,8 @@ $result_trees{'node_footnote_use_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -165,7 +166,6 @@ $result_trees{'node_footnote_use_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 9
@@ -263,7 +263,8 @@ $result_trees{'node_footnote_use_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -273,7 +274,6 @@ $result_trees{'node_footnote_use_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 11
@@ -377,7 +377,8 @@ $result_trees{'node_footnote_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -387,7 +388,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 14
@@ -416,7 +416,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +427,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 16
@@ -440,7 +440,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'Footnote 1'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,8 @@ $result_trees{'node_footnote_use_node'} = {
                           'text' => 'foot 1 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -459,7 +461,6 @@ $result_trees{'node_footnote_use_node'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 17
@@ -472,7 +473,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -511,7 +511,8 @@ $result_trees{'node_footnote_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 19
@@ -550,7 +550,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -560,7 +561,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 21
@@ -574,7 +574,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'Footnote 2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -583,7 +584,8 @@ $result_trees{'node_footnote_use_node'} = {
                           'text' => 'foot 2 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -593,7 +595,6 @@ $result_trees{'node_footnote_use_node'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 22
@@ -606,7 +607,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -719,7 +719,8 @@ $result_trees{'node_footnote_use_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -729,7 +730,6 @@ $result_trees{'node_footnote_use_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 28
@@ -832,7 +832,8 @@ $result_trees{'node_footnote_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -842,7 +843,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 31
@@ -871,7 +871,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 33
@@ -895,7 +895,8 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'Footnote 3'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -904,7 +905,8 @@ $result_trees{'node_footnote_use_node'} = {
                           'text' => 'foot 3 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -914,7 +916,6 @@ $result_trees{'node_footnote_use_node'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 34
@@ -927,7 +928,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
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 00ef592a69..445e171a6f 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
@@ -94,7 +94,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -104,7 +105,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 8
@@ -155,7 +155,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -165,7 +166,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 9
@@ -263,7 +263,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -273,7 +274,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 11
@@ -377,7 +377,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -387,7 +388,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 14
@@ -416,7 +416,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +427,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 16
@@ -440,7 +440,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'Footnote 1'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'text' => 'foot 1 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '\'',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -459,7 +461,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '\'',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 17
@@ -472,7 +473,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -511,7 +511,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -521,7 +522,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 19
@@ -550,7 +550,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -560,7 +561,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 21
@@ -574,7 +574,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'Footnote 2'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -583,7 +584,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'text' => 'foot 2 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -593,7 +595,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 22
@@ -606,7 +607,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
@@ -719,7 +719,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -729,7 +730,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'file_name' => 'node_footnote.texi',
                         'line_nr' => 28
@@ -832,7 +832,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -842,7 +843,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 31
@@ -871,7 +871,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'node '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -881,7 +882,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 33
@@ -895,7 +895,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'text' => 'Footnote 3'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -904,7 +905,8 @@ $result_trees{'node_footnote_use_node_separate'} = {
                           'text' => 'foot 3 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '`',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -914,7 +916,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                               'type' => 'following_arg'
                             }
                           ],
-                          'cmdname' => '`',
                           'source_info' => {
                             'file_name' => 'node_footnote.texi',
                             'line_nr' => 34
@@ -927,7 +928,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
diff --git a/tp/t/results/html_tests/nodedescription_description.pl 
b/tp/t/results/html_tests/nodedescription_description.pl
index 10d963deec..6cb4edb6a8 100644
--- a/tp/t/results/html_tests/nodedescription_description.pl
+++ b/tp/t/results/html_tests/nodedescription_description.pl
@@ -109,7 +109,8 @@ $result_trees{'nodedescription_description'} = {
                   'text' => 'toto is there:: and the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -119,13 +120,13 @@ $result_trees{'nodedescription_description'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 7
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -135,7 +136,6 @@ $result_trees{'nodedescription_description'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -144,7 +144,8 @@ $result_trees{'nodedescription_description'} = {
                   'text' => ' and '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -155,7 +156,6 @@ $result_trees{'nodedescription_description'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -167,7 +167,8 @@ $result_trees{'nodedescription_description'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +178,6 @@ $result_trees{'nodedescription_description'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'info' => {
                     'spaces_after_cmd_before_arg' => {
                       'text' => ' '
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 4244b893b8..e8fe57b3be 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
@@ -109,7 +109,8 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                   'text' => 'toto is there:: and the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -119,13 +120,13 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 7
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -135,7 +136,6 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -144,7 +144,8 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                   'text' => ' and '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -155,7 +156,6 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -167,7 +167,8 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +178,6 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'info' => {
                     'spaces_after_cmd_before_arg' => {
                       'text' => ' '
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 3bebaeed1f..3c94ccd5b8 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -320,7 +320,8 @@ $result_trees{'redirection_same_labels'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -330,7 +331,6 @@ $result_trees{'redirection_same_labels'} = [
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -379,11 +379,13 @@ $result_trees{'redirection_same_labels'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -393,7 +395,6 @@ $result_trees{'redirection_same_labels'} = [
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'line_nr' => 17
                               }
@@ -402,7 +403,6 @@ $result_trees{'redirection_same_labels'} = [
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -533,7 +533,8 @@ $result_trees{'redirection_same_labels'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => '"',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -543,7 +544,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'following_arg'
                   }
                 ],
-                'cmdname' => '"',
                 'source_info' => {
                   'line_nr' => 20
                 }
@@ -584,11 +584,13 @@ $result_trees{'redirection_same_labels'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => '~',
+                'contents' => [
                   {
                     'contents' => [
                       {
-                        'args' => [
+                        'cmdname' => 'dotless',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -598,7 +600,6 @@ $result_trees{'redirection_same_labels'} = [
                             'type' => 'brace_container'
                           }
                         ],
-                        'cmdname' => 'dotless',
                         'source_info' => {
                           'line_nr' => 22
                         }
@@ -607,7 +608,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'brace_container'
                   }
                 ],
-                'cmdname' => '~',
                 'source_info' => {
                   'line_nr' => 22
                 }
@@ -694,7 +694,8 @@ $result_trees{'redirection_same_labels'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -704,7 +705,6 @@ $result_trees{'redirection_same_labels'} = [
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 28
                       }
@@ -835,7 +835,8 @@ $result_trees{'redirection_same_labels'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => '^',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -845,7 +846,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'following_arg'
                   }
                 ],
-                'cmdname' => '^',
                 'source_info' => {
                   'line_nr' => 31
                 }
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 23e4360cb7..7e5aff8990 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -154,7 +154,8 @@ $result_trees{'ref_in_preformatted'} = {
                   'text' => 'Now '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +178,6 @@ $result_trees{'ref_in_preformatted'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -278,8 +278,8 @@ $result_trees{'ref_in_preformatted'} = {
   'type' => 'document_root'
 };
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'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 4db9c05980..2554d7122c 100644
--- a/tp/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -173,11 +173,13 @@ $result_trees{'sectioning_check_menu_structure'} = {
                           'text' => 'With command '
                         },
                         {
-                          'args' => [
+                          'cmdname' => '^',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'dotless',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -187,7 +189,6 @@ $result_trees{'sectioning_check_menu_structure'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'dotless',
                                   'source_info' => {
                                     'file_name' => 'sectioning.texi',
                                     'line_nr' => 9
@@ -197,7 +198,6 @@ $result_trees{'sectioning_check_menu_structure'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => '^',
                           'source_info' => {
                             'file_name' => 'sectioning.texi',
                             'line_nr' => 9
@@ -211,7 +211,8 @@ $result_trees{'sectioning_check_menu_structure'} = {
                           'text' => 'a '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'cite',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -221,7 +222,6 @@ $result_trees{'sectioning_check_menu_structure'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'cite',
                           'source_info' => {
                             'file_name' => 'sectioning.texi',
                             'line_nr' => 10
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index 36c04e7b0b..97d9a8aea7 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -25,7 +25,8 @@ $result_trees{'shorttitlepage'} = {
                   'text' => 'title '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -35,7 +36,6 @@ $result_trees{'shorttitlepage'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -44,7 +44,8 @@ $result_trees{'shorttitlepage'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -54,7 +55,6 @@ $result_trees{'shorttitlepage'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -132,7 +132,8 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'title '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'shorttitlepage'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -151,7 +151,8 @@ $result_trees{'shorttitlepage'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -161,7 +162,6 @@ $result_trees{'shorttitlepage'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl 
b/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
index e1344c4dbd..69f95cc298 100644
--- a/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
+++ b/tp/t/results/html_tests/spaces_in_line_break_in_verb_w.pl
@@ -12,7 +12,8 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -26,7 +27,6 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -46,7 +46,8 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -62,7 +63,6 @@ $result_trees{'spaces_in_line_break_in_verb_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '|'
               },
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 9086621db4..8b7950b775 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -171,7 +171,8 @@ $result_trees{'test_accents_sc_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'test_accents_sc_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'test_accents_sc_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'test_accents_sc_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'test_accents_sc_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'test_accents_sc_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'test_accents_sc_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'test_accents_sc_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'test_accents_sc_default'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'test_accents_sc_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'test_accents_sc_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'test_accents_sc_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
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 46afd8ce17..4224c30c4f 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
@@ -210,7 +210,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ $result_trees{'test_accents_sc_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 fa0573eca1..5f9a109046 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
@@ -210,7 +210,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ $result_trees{'test_accents_sc_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 7da7c3777f..840aa3cdac 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
@@ -171,7 +171,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
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 8871cb104b..3cc9542892 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
@@ -210,7 +210,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 7fe3d4306a..c0505ee13b 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
@@ -210,7 +210,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 66f19d6a29..c2f9d96dcf 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
@@ -210,7 +210,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 11d5dbcdf3..7227715416 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
@@ -210,7 +210,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ 
$result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ 
$result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 70203cb25e..ba9a8dd356 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
@@ -210,7 +210,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 49390e0b13..02d7da2f10 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
@@ -171,7 +171,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 1d23b9f16b..e535b320a1 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -271,7 +271,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -289,7 +290,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -346,7 +346,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -364,7 +365,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -393,8 +393,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
   'type' => 'document_root'
 };
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'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_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 d5de498f74..bb009d7412 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -278,7 +278,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -296,7 +297,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -353,7 +353,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -371,7 +372,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -400,8 +400,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
   'type' => 'document_root'
 };
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'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_texis{'test_xrefautomaticsectiontitle_off_first'} = '
 @xrefautomaticsectiontitle off
diff --git a/tp/t/results/html_tests/tex_expanded_in_caption_multiple_time.pl 
b/tp/t/results/html_tests/tex_expanded_in_caption_multiple_time.pl
index a01fa8aee7..948f154980 100644
--- a/tp/t/results/html_tests/tex_expanded_in_caption_multiple_time.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_caption_multiple_time.pl
@@ -49,7 +49,8 @@ $result_trees{'tex_expanded_in_caption_multiple_time'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -114,7 +115,6 @@ $result_trees{'tex_expanded_in_caption_multiple_time'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
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 93b390efd9..72a735c727 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
@@ -73,7 +73,8 @@ $result_trees{'text_css_info_in_init'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'text_css_info_in_init'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -103,11 +103,13 @@ $result_trees{'text_css_info_in_init'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -117,7 +119,6 @@ $result_trees{'text_css_info_in_init'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -126,7 +127,6 @@ $result_trees{'text_css_info_in_init'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -144,7 +144,8 @@ $result_trees{'text_css_info_in_init'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -154,7 +155,6 @@ $result_trees{'text_css_info_in_init'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 8
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 13354714d7..6c859758e0 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -25,7 +25,8 @@ $result_trees{'titles'} = {
                   'text' => 'title '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -35,7 +36,6 @@ $result_trees{'titles'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -44,7 +44,8 @@ $result_trees{'titles'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -54,7 +55,6 @@ $result_trees{'titles'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -132,7 +132,8 @@ $result_trees{'titles'} = {
               'text' => 'title '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'titles'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -151,7 +151,8 @@ $result_trees{'titles'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -161,7 +162,6 @@ $result_trees{'titles'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl 
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 7f54ebe977..3c60ee34a5 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -239,7 +239,8 @@ $result_trees{'transliterated_names_conflicts'} = [
             'type' => 'empty_line'
           },
           {
-            'args' => [
+            'cmdname' => 'anchor',
+            'contents' => [
               {
                 'contents' => [
                   {
@@ -249,7 +250,6 @@ $result_trees{'transliterated_names_conflicts'} = [
                 'type' => 'brace_arg'
               }
             ],
-            'cmdname' => 'anchor',
             'extra' => {
               'is_target' => 1,
               'normalized' => 'Pr_00eas'
diff --git a/tp/t/results/html_tests/uref_accented_letter.pl 
b/tp/t/results/html_tests/uref_accented_letter.pl
index f9f9876695..7ccf22a80e 100644
--- a/tp/t/results/html_tests/uref_accented_letter.pl
+++ b/tp/t/results/html_tests/uref_accented_letter.pl
@@ -12,14 +12,16 @@ $result_trees{'uref_accented_letter'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'http://example.com/acc_'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -29,13 +31,13 @@ $result_trees{'uref_accented_letter'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 1
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -45,7 +47,6 @@ $result_trees{'uref_accented_letter'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -54,7 +55,6 @@ $result_trees{'uref_accented_letter'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/html_tests/uref_accented_letter_ascii.pl 
b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
index fdd16f83b2..73d68d43f6 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -48,14 +48,16 @@ $result_trees{'uref_accented_letter_ascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'http://example.com/acc_'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,13 +67,13 @@ $result_trees{'uref_accented_letter_ascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 3
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -81,7 +83,6 @@ $result_trees{'uref_accented_letter_ascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -90,7 +91,6 @@ $result_trees{'uref_accented_letter_ascii'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/uref_accented_letter_latin1.pl 
b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
index 003035e2b0..75676ad533 100644
--- a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -48,14 +48,16 @@ $result_trees{'uref_accented_letter_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'http://example.com/acc_'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,13 +67,13 @@ $result_trees{'uref_accented_letter_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 3
                       }
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ogonek',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -81,7 +83,6 @@ $result_trees{'uref_accented_letter_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'ogonek',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -90,7 +91,6 @@ $result_trees{'uref_accented_letter_latin1'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/utf8_default.pl 
b/tp/t/results/html_tests/utf8_default.pl
index 13a6b9540c..c766d08a2d 100644
--- a/tp/t/results/html_tests/utf8_default.pl
+++ b/tp/t/results/html_tests/utf8_default.pl
@@ -51,7 +51,8 @@ $result_trees{'utf8_default'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'utf8_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/utf8_enable_encoding.pl 
b/tp/t/results/html_tests/utf8_enable_encoding.pl
index 707ff10cef..743498d79f 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding.pl
@@ -51,7 +51,8 @@ $result_trees{'utf8_enable_encoding'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'utf8_enable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
index bf4148b839..05faa3e98e 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
@@ -51,7 +51,8 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
index 67736a9927..d16b1ff506 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
@@ -51,7 +51,8 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/utf8_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
index cc9dd26296..6ca7c79226 100644
--- a/tp/t/results/html_tests/utf8_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
@@ -51,7 +51,8 @@ $result_trees{'utf8_use_numeric_entity'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,7 +62,6 @@ $result_trees{'utf8_use_numeric_entity'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index c0dcfda16d..95cb6c82fd 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -71,7 +71,8 @@ $result_trees{'xml_protected_in_verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -82,7 +83,6 @@ $result_trees{'xml_protected_in_verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 35b11bfbf9..a52947e0d3 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl 
b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
index 56bcd8b7d9..913ac76f57 100644
--- a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
+++ b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
@@ -139,7 +139,8 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -158,7 +159,6 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -178,7 +178,8 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -197,7 +198,6 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 594c3e759c..cf2afe5c63 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index f2a7295db6..94406c4e9c 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref_only_mono'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 8178e0da69..8e3fc09e14 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 2e8b2bf24a..1449aada8a 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref_only_split'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index d1d1c925b5..87e777a530 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -226,7 +226,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -237,7 +238,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -250,7 +250,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 12
@@ -382,7 +382,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -393,7 +394,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ';'
               },
@@ -406,7 +406,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 18
@@ -522,7 +522,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -533,7 +534,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -546,7 +546,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -590,7 +591,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 24
@@ -678,7 +678,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -689,7 +690,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -702,7 +702,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -733,7 +734,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 30
@@ -852,7 +852,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -863,7 +864,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -876,7 +876,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -912,7 +913,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 38
@@ -1034,7 +1034,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1045,7 +1046,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1058,7 +1058,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1076,7 +1077,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 46
@@ -1157,7 +1157,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1168,7 +1169,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1181,7 +1181,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1199,7 +1200,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 51
@@ -1283,7 +1283,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1294,7 +1295,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1307,7 +1307,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1330,7 +1331,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 56
@@ -1411,7 +1411,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1422,7 +1423,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1435,7 +1435,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1458,7 +1459,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 61
@@ -1733,7 +1733,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1744,7 +1745,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -1757,7 +1757,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 73
@@ -2527,20 +2527,20 @@ $result_trees{'htmlxref_only_split_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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];
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 4d0f6f49d1..62a07e461e 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -73,7 +73,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 68
@@ -307,7 +307,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -317,7 +318,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 57
@@ -376,7 +376,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -386,7 +387,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 61
@@ -472,7 +472,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -482,7 +483,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 68
@@ -547,7 +547,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -557,7 +558,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 72
@@ -627,7 +627,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -637,7 +638,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'inc',
                 'line_nr' => 10
@@ -666,7 +666,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -676,7 +677,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 75
@@ -697,7 +697,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -714,7 +715,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
@@ -738,7 +738,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -748,7 +749,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 81
@@ -772,7 +772,8 @@ $result_trees{'cpp_lines'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -787,7 +788,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -818,7 +818,8 @@ $result_trees{'cpp_lines'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -838,7 +839,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -871,7 +871,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -905,7 +906,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'footnote2',
                 'line_nr' => 40
@@ -926,7 +926,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -960,7 +961,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email2',
                 'line_nr' => 64
@@ -981,7 +981,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1015,7 +1016,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email2',
                 'line_nr' => 69
@@ -1036,7 +1036,8 @@ $result_trees{'cpp_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1054,7 +1055,6 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'file_name' => 'email12',
                 'line_nr' => 64
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 0e31960424..51b87a5ae9 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -199,7 +199,8 @@ $result_trees{'value_expansion_in_include'} = {
                           {
                             'counter' => 1,
                             'element' => {
-                              'args' => [
+                              'cmdname' => 'value',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -208,8 +209,7 @@ $result_trees{'value_expansion_in_include'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'value'
+                              ]
                             },
                             'line' => 'incl-incl.txi',
                             'position' => 1,
@@ -235,7 +235,8 @@ $result_trees{'value_expansion_in_include'} = {
               'text' => 'This is the '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -245,7 +246,6 @@ $result_trees{'value_expansion_in_include'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
                 'line_nr' => 1
@@ -315,7 +315,8 @@ $result_trees{'value_expansion_in_include'} = {
                 {
                   'counter' => 2,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -324,8 +325,7 @@ $result_trees{'value_expansion_in_include'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'incl-incl.txi',
                   'position' => 1,
@@ -391,7 +391,8 @@ $result_trees{'value_expansion_in_include'} = {
                           {
                             'counter' => 3,
                             'element' => {
-                              'args' => [
+                              'cmdname' => 'value',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -400,8 +401,7 @@ $result_trees{'value_expansion_in_include'} = {
                                   ],
                                   'type' => 'brace_container'
                                 }
-                              ],
-                              'cmdname' => 'value'
+                              ]
                             },
                             'line' => 'incl-incl.tx',
                             'position' => 1,
@@ -427,7 +427,8 @@ $result_trees{'value_expansion_in_include'} = {
               'text' => 'This is the '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -437,7 +438,6 @@ $result_trees{'value_expansion_in_include'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
                 'line_nr' => 1
@@ -507,7 +507,8 @@ $result_trees{'value_expansion_in_include'} = {
                 {
                   'counter' => 4,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -516,8 +517,7 @@ $result_trees{'value_expansion_in_include'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'incl-incl.tx',
                   'position' => 1,
@@ -557,7 +557,8 @@ $result_trees{'value_expansion_in_include'} = {
                               {
                                 'counter' => 5,
                                 'element' => {
-                                  'args' => [
+                                  'cmdname' => 'value',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -566,8 +567,7 @@ $result_trees{'value_expansion_in_include'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'value'
+                                  ]
                                 },
                                 'line' => 'ncl-incl.tx',
                                 'position' => 1,
@@ -617,7 +617,8 @@ $result_trees{'value_expansion_in_include'} = {
               'text' => 'This is the '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -627,7 +628,6 @@ $result_trees{'value_expansion_in_include'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'file_name' => 'incl-incl.txi',
                 'line_nr' => 1
@@ -670,7 +670,8 @@ $result_trees{'value_expansion_in_include'} = {
                     {
                       'counter' => 6,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -679,8 +680,7 @@ $result_trees{'value_expansion_in_include'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'ncl-incl.tx',
                       'position' => 1,
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index f37f15a97e..5366555e59 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -313,7 +313,8 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'a '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -323,7 +324,6 @@ $result_trees{'def_syn_indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -332,7 +332,8 @@ $result_trees{'def_syn_indices'} = {
                   'text' => ' t'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -342,7 +343,6 @@ $result_trees{'def_syn_indices'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -351,11 +351,13 @@ $result_trees{'def_syn_indices'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -365,7 +367,6 @@ $result_trees{'def_syn_indices'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 17
                           }
@@ -374,7 +375,6 @@ $result_trees{'def_syn_indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 17
                   }
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 091039f02b..063caae518 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -149,7 +149,8 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -159,7 +160,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -169,7 +169,8 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -179,7 +180,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -219,7 +219,8 @@ $result_trees{'double_seeentry_seealso'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -229,7 +230,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -246,7 +246,8 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -256,7 +257,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -303,7 +303,8 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -323,7 +323,8 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,7 +334,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -374,7 +374,8 @@ $result_trees{'double_seeentry_seealso'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'double_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -407,7 +407,8 @@ $result_trees{'double_seeentry_seealso'} = {
             ],
             'seealso' => {},
             'seeentry' => {
-              'args' => [
+              'cmdname' => 'seeentry',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -417,7 +418,6 @@ $result_trees{'double_seeentry_seealso'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'seeentry',
               'source_info' => {
                 'line_nr' => 10
               }
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index a2a8969df8..cae69c2164 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -75,12 +75,12 @@ $result_trees{'empty_string_index_entry'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -150,12 +150,12 @@ $result_trees{'empty_string_index_entry'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 7
                               }
@@ -276,12 +276,12 @@ $result_trees{'empty_string_index_entry'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 10
                               }
@@ -342,12 +342,12 @@ $result_trees{'empty_string_index_entry'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'w',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'w'
+                          ]
                         }
                       ],
                       'type' => 'bracketed_arg'
@@ -399,12 +399,12 @@ $result_trees{'empty_string_index_entry'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -466,12 +466,12 @@ $result_trees{'empty_string_index_entry'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'w',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'w'
+                          ]
                         }
                       ],
                       'type' => 'bracketed_arg'
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 444586bc86..0c6c541763 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -186,7 +186,8 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -196,7 +197,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -205,7 +205,8 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -215,7 +216,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -254,7 +254,8 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -264,7 +265,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -273,7 +273,8 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -283,13 +284,13 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -299,13 +300,13 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -315,7 +316,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -354,7 +354,8 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -364,7 +365,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -373,7 +373,8 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -383,13 +384,13 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -399,13 +400,13 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -415,13 +416,13 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -431,7 +432,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -1478,12 +1478,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'line_nr' => 40
                   }
@@ -1522,12 +1522,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'line_nr' => 41
                   }
@@ -1566,7 +1566,8 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1576,7 +1577,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 42
                   }
@@ -1585,7 +1585,8 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1595,7 +1596,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 42
                   }
@@ -1637,11 +1637,13 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1651,7 +1653,6 @@ $result_trees{'encoding_index_ascii'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 43
                           }
@@ -1660,7 +1661,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 43
                   }
@@ -1669,11 +1669,13 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1683,7 +1685,6 @@ $result_trees{'encoding_index_ascii'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 43
                           }
@@ -1692,7 +1693,6 @@ $result_trees{'encoding_index_ascii'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 43
                   }
@@ -1734,12 +1734,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'line_nr' => 44
                   }
@@ -1778,12 +1778,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'line_nr' => 45
                   }
@@ -1822,12 +1822,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'line_nr' => 46
                   }
@@ -1866,12 +1866,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'line_nr' => 47
                   }
@@ -1910,12 +1910,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'line_nr' => 48
                   }
@@ -1954,12 +1954,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -1998,12 +1998,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ordf',
                   'source_info' => {
                     'line_nr' => 50
                   }
@@ -2042,12 +2042,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ordm',
                   'source_info' => {
                     'line_nr' => 51
                   }
@@ -2086,12 +2086,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'line_nr' => 52
                   }
@@ -2202,12 +2202,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'line_nr' => 55
                   }
@@ -2246,12 +2246,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'line_nr' => 56
                   }
@@ -2290,12 +2290,12 @@ $result_trees{'encoding_index_ascii'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'line_nr' => 57
                   }
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 078cde3c8e..7d2f8b3344 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -186,7 +186,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -196,7 +197,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -205,7 +205,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -215,7 +216,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -254,7 +254,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -264,7 +265,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -273,7 +273,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -283,13 +284,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -299,13 +300,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -315,7 +316,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -354,7 +354,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -364,7 +365,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -373,7 +373,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -383,13 +384,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -399,13 +400,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -415,13 +416,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -431,7 +432,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -1478,12 +1478,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'line_nr' => 40
                   }
@@ -1522,12 +1522,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'line_nr' => 41
                   }
@@ -1566,7 +1566,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1576,7 +1577,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 42
                   }
@@ -1585,7 +1585,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1595,7 +1596,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'line_nr' => 42
                   }
@@ -1637,11 +1637,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1651,7 +1653,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 43
                           }
@@ -1660,7 +1661,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 43
                   }
@@ -1669,11 +1669,13 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1683,7 +1685,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 43
                           }
@@ -1692,7 +1693,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 43
                   }
@@ -1734,12 +1734,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'line_nr' => 44
                   }
@@ -1778,12 +1778,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'line_nr' => 45
                   }
@@ -1822,12 +1822,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'line_nr' => 46
                   }
@@ -1866,12 +1866,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'line_nr' => 47
                   }
@@ -1910,12 +1910,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'line_nr' => 48
                   }
@@ -1954,12 +1954,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'line_nr' => 49
                   }
@@ -1998,12 +1998,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ordf',
                   'source_info' => {
                     'line_nr' => 50
                   }
@@ -2042,12 +2042,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ordm',
                   'source_info' => {
                     'line_nr' => 51
                   }
@@ -2086,12 +2086,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'line_nr' => 52
                   }
@@ -2202,12 +2202,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'line_nr' => 55
                   }
@@ -2246,12 +2246,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'line_nr' => 56
                   }
@@ -2290,12 +2290,12 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'line_nr' => 57
                   }
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index c1ef75542e..88a93fea5f 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -198,7 +198,8 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
@@ -218,7 +218,8 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,14 +229,14 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,14 +246,14 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -262,7 +263,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
@@ -303,7 +303,8 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
@@ -323,7 +323,8 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,14 +334,14 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -350,14 +351,14 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -367,14 +368,14 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
@@ -1461,12 +1461,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 40
@@ -1507,12 +1507,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 41
@@ -1553,7 +1553,8 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1563,7 +1564,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 42
@@ -1573,7 +1573,8 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1583,7 +1584,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 42
@@ -1627,11 +1627,13 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1641,7 +1643,6 @@ $result_trees{'encoding_index_latin1'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
                             'line_nr' => 43
@@ -1651,7 +1652,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 43
@@ -1661,11 +1661,13 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1675,7 +1677,6 @@ $result_trees{'encoding_index_latin1'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
                             'line_nr' => 43
@@ -1685,7 +1686,6 @@ $result_trees{'encoding_index_latin1'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 43
@@ -1729,12 +1729,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 44
@@ -1775,12 +1775,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 45
@@ -1821,12 +1821,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 46
@@ -1867,12 +1867,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 47
@@ -1913,12 +1913,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 48
@@ -1959,12 +1959,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 49
@@ -2005,12 +2005,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 50
@@ -2125,12 +2125,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 53
@@ -2171,12 +2171,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 54
@@ -2217,12 +2217,12 @@ $result_trees{'encoding_index_latin1'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 55
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 114aaf9c1d..97205de808 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -198,7 +198,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
@@ -218,7 +218,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,14 +229,14 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,14 +246,14 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -262,7 +263,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 10
@@ -303,7 +303,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
@@ -323,7 +323,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,14 +334,14 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -350,14 +351,14 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -367,14 +368,14 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 11
@@ -1461,12 +1461,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 40
@@ -1507,12 +1507,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 41
@@ -1553,7 +1553,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1563,7 +1564,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 42
@@ -1573,7 +1573,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1583,7 +1584,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 42
@@ -1627,11 +1627,13 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1641,7 +1643,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
                             'line_nr' => 43
@@ -1651,7 +1652,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 43
@@ -1661,11 +1661,13 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1675,7 +1677,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_latin1.texi',
                             'line_nr' => 43
@@ -1685,7 +1686,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 43
@@ -1729,12 +1729,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 44
@@ -1775,12 +1775,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 45
@@ -1821,12 +1821,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 46
@@ -1867,12 +1867,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 47
@@ -1913,12 +1913,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 48
@@ -1959,12 +1959,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 49
@@ -2005,12 +2005,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 50
@@ -2125,12 +2125,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 53
@@ -2171,12 +2171,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 54
@@ -2217,12 +2217,12 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_latin1.texi',
                     'line_nr' => 55
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index cee6ffea21..97ac0bb176 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -198,7 +198,8 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -218,7 +218,8 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,14 +229,14 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,14 +246,14 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -262,7 +263,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -303,7 +303,8 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -323,7 +323,8 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,14 +334,14 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -350,14 +351,14 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -367,14 +368,14 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -1461,12 +1461,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 40
@@ -1507,12 +1507,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 41
@@ -1553,7 +1553,8 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1563,7 +1564,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1573,7 +1573,8 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1583,7 +1584,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1627,11 +1627,13 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1641,7 +1643,6 @@ $result_trees{'encoding_index_utf8'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1651,7 +1652,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1661,11 +1661,13 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1675,7 +1677,6 @@ $result_trees{'encoding_index_utf8'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1685,7 +1686,6 @@ $result_trees{'encoding_index_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1729,12 +1729,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 44
@@ -1775,12 +1775,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 45
@@ -1821,12 +1821,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 46
@@ -1867,12 +1867,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 47
@@ -1913,12 +1913,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 48
@@ -1959,12 +1959,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 49
@@ -2005,12 +2005,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 50
@@ -2125,12 +2125,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 53
@@ -2171,12 +2171,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 54
@@ -2217,12 +2217,12 @@ $result_trees{'encoding_index_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 55
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 460c0f7dbb..8ed3cef24f 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -198,7 +198,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -218,7 +218,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,14 +229,14 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,14 +246,14 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -262,7 +263,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -303,7 +303,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -323,7 +323,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,14 +334,14 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -350,14 +351,14 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -367,14 +368,14 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -1461,12 +1461,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 40
@@ -1507,12 +1507,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 41
@@ -1553,7 +1553,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1563,7 +1564,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1573,7 +1573,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1583,7 +1584,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1627,11 +1627,13 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1641,7 +1643,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1651,7 +1652,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1661,11 +1661,13 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1675,7 +1677,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1685,7 +1686,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1729,12 +1729,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 44
@@ -1775,12 +1775,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 45
@@ -1821,12 +1821,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 46
@@ -1867,12 +1867,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 47
@@ -1913,12 +1913,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 48
@@ -1959,12 +1959,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 49
@@ -2005,12 +2005,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 50
@@ -2125,12 +2125,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 53
@@ -2171,12 +2171,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 54
@@ -2217,12 +2217,12 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 55
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 d31b8b0b07..21cb36c181 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
@@ -198,7 +198,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -208,7 +209,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -218,7 +218,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,14 +229,14 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,14 +246,14 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -262,7 +263,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 10
@@ -303,7 +303,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -313,7 +314,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -323,7 +323,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -333,14 +334,14 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -350,14 +351,14 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -367,14 +368,14 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -384,7 +385,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 11
@@ -1461,12 +1461,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'l',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'l',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 40
@@ -1507,12 +1507,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'L',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'L',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 41
@@ -1553,7 +1553,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1563,7 +1564,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1573,7 +1573,8 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'dotless',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1583,7 +1584,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'dotless',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 42
@@ -1627,11 +1627,13 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1641,7 +1643,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1651,7 +1652,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1661,11 +1661,13 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1675,7 +1677,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'file_name' => 'encoding_index_utf8.texi',
                             'line_nr' => 43
@@ -1685,7 +1686,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 43
@@ -1729,12 +1729,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ss',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 44
@@ -1775,12 +1775,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'euro',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 45
@@ -1821,12 +1821,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'AE',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 46
@@ -1867,12 +1867,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 47
@@ -1913,12 +1913,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 48
@@ -1959,12 +1959,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'DH',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 49
@@ -2005,12 +2005,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'textdegree',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 50
@@ -2125,12 +2125,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 53
@@ -2171,12 +2171,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'geq',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 54
@@ -2217,12 +2217,12 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'file_name' => 'encoding_index_utf8.texi',
                     'line_nr' => 55
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 215936ba61..65cb9be12e 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -137,7 +137,8 @@ $result_trees{'explicit_sort_key'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -147,7 +148,6 @@ $result_trees{'explicit_sort_key'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -194,7 +194,8 @@ $result_trees{'explicit_sort_key'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -204,7 +205,6 @@ $result_trees{'explicit_sort_key'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -251,7 +251,8 @@ $result_trees{'explicit_sort_key'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -261,7 +262,6 @@ $result_trees{'explicit_sort_key'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -308,14 +308,16 @@ $result_trees{'explicit_sort_key'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'b',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'aaa '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sortas',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -325,7 +327,6 @@ $result_trees{'explicit_sort_key'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'sortas',
                           'source_info' => {
                             'line_nr' => 11
                           }
@@ -334,7 +335,6 @@ $result_trees{'explicit_sort_key'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'b',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -379,7 +379,8 @@ $result_trees{'explicit_sort_key'} = {
               'text' => 'in a reuglar para '
             },
             {
-              'args' => [
+              'cmdname' => 'sortas',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -389,7 +390,6 @@ $result_trees{'explicit_sort_key'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'sortas',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -398,14 +398,16 @@ $result_trees{'explicit_sort_key'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'inside another '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -415,7 +417,6 @@ $result_trees{'explicit_sort_key'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -424,7 +425,6 @@ $result_trees{'explicit_sort_key'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -444,14 +444,16 @@ $result_trees{'explicit_sort_key'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sortas',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'and cmd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -461,7 +463,6 @@ $result_trees{'explicit_sort_key'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 15
                       }
@@ -470,7 +471,6 @@ $result_trees{'explicit_sort_key'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'sortas',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -480,14 +480,16 @@ $result_trees{'explicit_sort_key'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'url',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'and cmd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -497,7 +499,6 @@ $result_trees{'explicit_sort_key'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -506,7 +507,6 @@ $result_trees{'explicit_sort_key'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'url',
               'source_info' => {
                 'line_nr' => 16
               }
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index bd95ed31e4..eaffa0513a 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -320,12 +320,12 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'var1 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'error',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'error',
                               'source_info' => {
                                 'line_nr' => 13
                               }
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 4646add970..033463c85b 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -235,7 +235,8 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -245,7 +246,6 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 11
                   }
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 0e904a43b6..76780fab8a 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 22b807f9a9..693854229c 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_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index 5f67c0413e..10aa2736b2 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 1e8572f917..af40ed485e 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
@@ -229,7 +229,8 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               'text' => 'chap node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -350,7 +351,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 10
@@ -458,8 +458,8 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
 };
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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'}[2]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[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'}[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_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 07d727f4f4..f450cdde45 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -76,7 +76,8 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'text' => 'Top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -275,7 +275,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[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'}[1]{'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 9cebfdeb10..d22be14aad 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
@@ -76,7 +76,8 @@ $result_trees{'index_entry_in_footnote_sections_separate'} = {
               'text' => 'Top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -275,7 +275,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]{'args'}[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'}[1]{'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 8116012057..ed152b2b2d 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -263,7 +263,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'text' => 'chap node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -384,7 +385,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 11
@@ -492,8 +492,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
 };
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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'}[2]{'contents'}[1]{'contents'}[1]{'args'}[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]{'args'}[0]{'contents'}[6]{'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'}[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_texis{'index_entry_in_footnote_separate'} = '@footnotestyle separate
 @node Top
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 2f77f8a7f4..9055fd4fdd 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -83,7 +83,8 @@ $result_trees{'index_special_region'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ $result_trees{'index_special_region'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ $result_trees{'index_special_region'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ $result_trees{'index_special_region'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ $result_trees{'index_special_region'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -372,7 +372,8 @@ $result_trees{'index_special_region'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ $result_trees{'index_special_region'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ $result_trees{'index_special_region'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ $result_trees{'index_special_region'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ $result_trees{'index_special_region'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -1401,7 +1401,8 @@ $result_trees{'index_special_region'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1419,7 +1420,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 68
@@ -1430,7 +1430,8 @@ $result_trees{'index_special_region'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1448,7 +1449,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 69
@@ -1469,7 +1469,8 @@ $result_trees{'index_special_region'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1487,7 +1488,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 71
@@ -1498,7 +1498,8 @@ $result_trees{'index_special_region'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1516,7 +1517,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 72
@@ -1673,10 +1673,10 @@ 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'c
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 753cefc7ca..0f096473b8 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -83,7 +83,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -372,7 +372,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -1396,7 +1396,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1414,7 +1415,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 68
@@ -1425,7 +1425,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1443,7 +1444,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 69
@@ -1464,7 +1464,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1482,7 +1483,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 71
@@ -1493,7 +1493,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1511,7 +1512,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 72
@@ -1663,10 +1663,10 @@ 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 1dd17b4058..30e36162a8 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
@@ -83,7 +83,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -372,7 +372,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -1396,7 +1396,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1414,7 +1415,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 68
@@ -1425,7 +1425,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1443,7 +1444,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 69
@@ -1464,7 +1464,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1482,7 +1483,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 71
@@ -1493,7 +1493,8 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1511,7 +1512,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 72
@@ -1663,10 +1663,10 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'co
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 b4336e23a7..3a9c24c32a 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
@@ -83,7 +83,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -372,7 +372,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -1396,7 +1396,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1414,7 +1415,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 68
@@ -1425,7 +1425,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1443,7 +1444,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 69
@@ -1464,7 +1464,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1482,7 +1483,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 71
@@ -1493,7 +1493,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1511,7 +1512,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 72
@@ -1663,10 +1663,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'conte
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 26ca4c93de..8afba347ec 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
@@ -83,7 +83,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -372,7 +372,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
@@ -1396,7 +1396,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1414,7 +1415,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 68
@@ -1425,7 +1425,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1443,7 +1444,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 69
@@ -1464,7 +1464,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1482,7 +1483,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 71
@@ -1493,7 +1493,8 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1511,7 +1512,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 72
@@ -1663,10 +1663,10 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 d85b474cee..214ec6ce80 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
@@ -83,7 +83,8 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} = 
{
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} = 
{
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -372,7 +372,8 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -1401,7 +1401,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1419,7 +1420,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 68
@@ -1430,7 +1430,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1448,7 +1449,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 69
@@ -1469,7 +1469,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1487,7 +1488,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 71
@@ -1498,7 +1498,8 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1516,7 +1517,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 72
@@ -1673,10 +1673,10 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'cont
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 e7e96c440a..292d8f52f7 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
@@ -83,7 +83,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -372,7 +372,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -1401,7 +1401,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1419,7 +1420,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 68
@@ -1430,7 +1430,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1448,7 +1449,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 69
@@ -1469,7 +1469,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1487,7 +1488,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 71
@@ -1498,7 +1498,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1516,7 +1517,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 72
@@ -1673,10 +1673,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'content
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 0e74ae02f3..dc27083e21 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
@@ -83,7 +83,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -96,7 +97,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Copying-information'
@@ -126,11 +126,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'text' => 'domain'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -143,7 +145,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Public-domain-reference'
@@ -216,7 +217,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -372,7 +372,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'index_entry_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -385,7 +386,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'Titlepage-anchor'
@@ -411,11 +411,13 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'text' => 'This is the titlepage'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -428,7 +430,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'Titlepage-footnote-anchor'
@@ -498,7 +499,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
@@ -1401,7 +1401,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1419,7 +1420,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 68
@@ -1430,7 +1430,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1448,7 +1449,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 69
@@ -1469,7 +1469,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1487,7 +1488,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 71
@@ -1498,7 +1498,8 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1516,7 +1517,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 72
@@ -1673,10 +1673,10 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'cont
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_texis{'index_special_region_titlepage_no_nodes_footnotes_default'} = 
'\\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 49e9313783..3e87e37e61 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
@@ -138,7 +138,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -148,7 +149,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -164,7 +164,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -174,7 +175,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -191,7 +191,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -201,7 +202,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -249,7 +249,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -259,7 +260,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -312,7 +312,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -322,7 +323,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 9
                   }
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 1497e8bf9e..3248bea3f7 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
@@ -36,7 +36,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                       'text' => 'Copying'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -93,7 +94,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
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 73d20ca306..4dc597a427 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -227,7 +227,8 @@ $result_trees{'same_index_entry_merged_indices'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -237,7 +238,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 11
                               }
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index cae1cb7e1b..ee39eae019 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -149,7 +149,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -159,7 +160,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -206,7 +206,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -216,7 +217,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -268,7 +268,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -278,7 +279,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -325,7 +325,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -335,7 +336,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -387,7 +387,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -397,7 +398,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -444,7 +444,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -454,7 +455,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 14
                   }
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 7464cd2d24..21e8dcf5b1 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -149,7 +149,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -159,7 +160,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -206,7 +206,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -216,7 +217,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -268,7 +268,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -278,7 +279,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -325,7 +325,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -335,7 +336,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -387,7 +387,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -397,7 +398,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -444,7 +444,8 @@ $result_trees{'same_seealso_seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -454,7 +455,6 @@ $result_trees{'same_seealso_seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 14
                   }
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 409ccda4d6..51998deb34 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -75,7 +75,8 @@ $result_trees{'seealso_duplicate'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -85,7 +86,6 @@ $result_trees{'seealso_duplicate'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -155,7 +155,8 @@ $result_trees{'seealso_duplicate'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -165,7 +166,6 @@ $result_trees{'seealso_duplicate'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -187,14 +187,16 @@ $result_trees{'seealso_duplicate'} = {
               2
             ],
             'seealso' => {
-              'args' => [
+              'cmdname' => 'seealso',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'POSIX '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -204,7 +206,6 @@ $result_trees{'seealso_duplicate'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -213,7 +214,6 @@ $result_trees{'seealso_duplicate'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'seealso',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -305,7 +305,8 @@ $result_trees{'seealso_duplicate'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -315,7 +316,6 @@ $result_trees{'seealso_duplicate'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -337,7 +337,8 @@ $result_trees{'seealso_duplicate'} = {
               3
             ],
             'seeentry' => {
-              'args' => [
+              'cmdname' => 'seeentry',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -347,7 +348,6 @@ $result_trees{'seealso_duplicate'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'seeentry',
               'source_info' => {
                 'line_nr' => 11
               }
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 9ae8c4db98..ca0fc3e12a 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -139,7 +139,8 @@ $result_trees{'seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -149,7 +150,6 @@ $result_trees{'seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -189,7 +189,8 @@ $result_trees{'seeentry'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -199,7 +200,6 @@ $result_trees{'seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -258,7 +258,8 @@ $result_trees{'seeentry'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'seeentry',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -268,7 +269,6 @@ $result_trees{'seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seeentry',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -308,7 +308,8 @@ $result_trees{'seeentry'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'seealso',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -318,7 +319,6 @@ $result_trees{'seeentry'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'seealso',
                   'source_info' => {
                     'line_nr' => 11
                   }
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index a7a664b2e4..5eb90d865d 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -1097,7 +1097,8 @@ $result_trees{'sorted_subentries'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1107,7 +1108,6 @@ $result_trees{'sorted_subentries'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 24
                   }
@@ -1177,7 +1177,8 @@ $result_trees{'sorted_subentries'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1187,7 +1188,6 @@ $result_trees{'sorted_subentries'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 25
                   }
@@ -1213,7 +1213,8 @@ $result_trees{'sorted_subentries'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1223,7 +1224,6 @@ $result_trees{'sorted_subentries'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 25
                       }
@@ -1244,7 +1244,8 @@ $result_trees{'sorted_subentries'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'email',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1262,7 +1263,6 @@ $result_trees{'sorted_subentries'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'email',
                           'source_info' => {
                             'line_nr' => 25
                           }
@@ -1422,7 +1422,8 @@ $result_trees{'sorted_subentries'} = {
                           'type' => 'spaces_at_end'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sortas',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1432,7 +1433,6 @@ $result_trees{'sorted_subentries'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'sortas',
                           'source_info' => {
                             'line_nr' => 27
                           }
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 98ff3f6e52..8eb282a18d 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -139,7 +139,8 @@ $result_trees{'subentry_and_sortas'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -149,7 +150,6 @@ $result_trees{'subentry_and_sortas'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -176,7 +176,8 @@ $result_trees{'subentry_and_sortas'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -186,7 +187,6 @@ $result_trees{'subentry_and_sortas'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -253,7 +253,8 @@ $result_trees{'subentry_and_sortas'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -263,7 +264,6 @@ $result_trees{'subentry_and_sortas'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -290,7 +290,8 @@ $result_trees{'subentry_and_sortas'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -300,7 +301,6 @@ $result_trees{'subentry_and_sortas'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 9
                       }
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 3e70fa61e9..283366bc65 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -139,7 +139,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -149,7 +150,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -171,7 +171,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -181,7 +182,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -255,7 +255,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -265,7 +266,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -347,7 +347,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           'text' => 'ccc'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sortas',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -357,7 +358,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'sortas',
                           'source_info' => {
                             'line_nr' => 9
                           }
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 45a45b0455..45fe055ae6 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -124,7 +124,8 @@ $result_trees{'transparent_sort_chars'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -134,7 +135,6 @@ $result_trees{'transparent_sort_chars'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -143,7 +143,8 @@ $result_trees{'transparent_sort_chars'} = {
                   'text' => ', for '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -153,7 +154,6 @@ $result_trees{'transparent_sort_chars'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 8
                   }
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index d562569b03..bc78d32e93 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 b6193f3bbd..b3dea6c040 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -61,7 +61,8 @@ $result_trees{'anchor_and_spaces'} = {
       'cmdname' => 'top',
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -71,7 +72,6 @@ $result_trees{'anchor_and_spaces'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'anchor-0'
@@ -96,7 +96,8 @@ $result_trees{'anchor_and_spaces'} = {
               'text' => 'Now '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -106,7 +107,6 @@ $result_trees{'anchor_and_spaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anchor1'
@@ -133,7 +133,8 @@ $result_trees{'anchor_and_spaces'} = {
               'text' => 'No space'
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -143,7 +144,6 @@ $result_trees{'anchor_and_spaces'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anchor2'
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index c4651739ee..6d74eee86d 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -37,19 +37,20 @@ $result_trees{'anchor_in_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'aaa '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -58,7 +59,8 @@ $result_trees{'anchor_in_command'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -68,7 +70,6 @@ $result_trees{'anchor_in_command'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -91,14 +92,16 @@ $result_trees{'anchor_in_command'} = {
                       'text' => 'emph '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'emph2 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -108,7 +111,6 @@ $result_trees{'anchor_in_command'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'anchor-in-emph'
@@ -121,7 +123,6 @@ $result_trees{'anchor_in_command'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -130,7 +131,6 @@ $result_trees{'anchor_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 3
               }
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 4452fcf11b..a0677f70d7 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -19,7 +19,8 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'ref to Top '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -37,7 +38,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -85,7 +85,8 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'Hey'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +101,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -114,7 +114,8 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'An anchor '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -124,7 +125,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anchor1'
@@ -324,7 +324,8 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'ref to anchor1'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -339,7 +340,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 15
@@ -355,7 +355,8 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'node Top: '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -373,7 +374,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -605,9 +605,9 @@ $result_trees{'before_node_and_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'before_node_and_section'} = 'Garbage
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 195b894482..c333243d07 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -117,7 +117,8 @@ $result_trees{'center_flush'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -127,7 +128,6 @@ $result_trees{'center_flush'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'anchor-in-flushleft'
@@ -264,7 +264,8 @@ $result_trees{'center_flush'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -274,7 +275,6 @@ $result_trees{'center_flush'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'anchor-in-flushright'
@@ -296,7 +296,8 @@ $result_trees{'center_flush'} = {
                   'text' => 'Second anchor in text '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -306,7 +307,6 @@ $result_trees{'center_flush'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'second-anchor-in-flushright'
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 faa5e8d22c..d1e5acb1ef 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
@@ -65,7 +65,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => 'One'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -75,7 +76,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -84,12 +84,12 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -244,7 +244,8 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'text' => 'One'
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -254,7 +255,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -263,12 +263,12 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'text' => 'node'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 8
               }
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 3fbe591390..e636856d4e 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
@@ -65,7 +65,8 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                       'text' => 'One'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -75,7 +76,6 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -84,12 +84,12 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -244,7 +244,8 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'text' => 'One'
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -254,7 +255,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -263,12 +263,12 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'text' => 'node'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/info_tests/del_quote_linebreaking.pl 
b/tp/t/results/info_tests/del_quote_linebreaking.pl
index 980ac49ae8..6f1f9871a5 100644
--- a/tp/t/results/info_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/info_tests/del_quote_linebreaking.pl
@@ -29,7 +29,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -73,7 +74,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -96,7 +96,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -140,7 +141,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -163,7 +163,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -207,7 +208,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -244,7 +244,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -311,7 +311,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -355,7 +356,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -378,7 +378,8 @@ $result_trees{'del_quote_linebreaking'} = {
               'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -422,7 +423,6 @@ $result_trees{'del_quote_linebreaking'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -445,12 +445,12 @@ $result_trees{'del_quote_linebreaking'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'del_quote_linebreaking'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'del_quote_linebreaking'} = 'first para
 
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index ea6923b356..7879ed47c0 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -75,7 +75,8 @@ $result_trees{'direntry_dircategory'} = {
                       'text' => '``category---'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -85,7 +86,6 @@ $result_trees{'direntry_dircategory'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'file_name' => 'direntry_dircategory.texi',
                         'line_nr' => 5
@@ -180,7 +180,8 @@ $result_trees{'direntry_dircategory'} = {
                               'text' => '``hello---'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -190,7 +191,6 @@ $result_trees{'direntry_dircategory'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'file_name' => 'direntry_dircategory.texi',
                                 'line_nr' => 7
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 91f610e316..98240d413c 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -17,7 +17,8 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'text' => '``category---'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -120,7 +120,8 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                           'text' => '``hello---'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -130,7 +131,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 3
                           }
diff --git a/tp/t/results/info_tests/empty_arguments.pl 
b/tp/t/results/info_tests/empty_arguments.pl
index d8eca5b517..802a683f57 100644
--- a/tp/t/results/info_tests/empty_arguments.pl
+++ b/tp/t/results/info_tests/empty_arguments.pl
@@ -17,12 +17,12 @@ $result_trees{'empty_arguments'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -32,7 +32,8 @@ $result_trees{'empty_arguments'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -40,7 +41,6 @@ $result_trees{'empty_arguments'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -50,7 +50,8 @@ $result_trees{'empty_arguments'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -63,7 +64,6 @@ $result_trees{'empty_arguments'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index ae22bf0f29..6c916e1021 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -78,12 +78,12 @@ $result_trees{'empty_caption'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
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 d2ddf427f3..c80bf5c151 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
@@ -312,7 +312,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -328,7 +329,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'ankh-p'
@@ -528,7 +528,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -562,7 +563,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -582,7 +582,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -608,7 +609,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -628,7 +628,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -673,7 +674,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -952,17 +952,17 @@ 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$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'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index ad8ac45d42..d8b03277f8 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -91,7 +91,8 @@ $result_trees{'error_in_footnote'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -113,7 +114,8 @@ $result_trees{'error_in_footnote'} = {
                           'text' => 'In caption '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'strong',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -123,7 +125,6 @@ $result_trees{'error_in_footnote'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'strong',
                           'source_info' => {
                             'line_nr' => 9
                           }
@@ -136,7 +137,8 @@ $result_trees{'error_in_footnote'} = {
                           'text' => 'Now footnote'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -155,7 +157,8 @@ $result_trees{'error_in_footnote'} = {
                                       'text' => 'and strong '
                                     },
                                     {
-                                      'args' => [
+                                      'cmdname' => 'strong',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -165,7 +168,6 @@ $result_trees{'error_in_footnote'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'strong',
                                       'source_info' => {
                                         'line_nr' => 11
                                       }
@@ -180,7 +182,6 @@ $result_trees{'error_in_footnote'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
@@ -193,7 +194,6 @@ $result_trees{'error_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 9f4e0b740d..2fcf505415 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 7fb04421e3..420fc7eed7 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -65,7 +65,8 @@ $result_trees{'float_long_captions'} = {
           'cmdname' => 'float',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -80,7 +81,6 @@ $result_trees{'float_long_captions'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -175,7 +175,8 @@ $result_trees{'float_long_captions'} = {
           'cmdname' => 'float',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -190,7 +191,6 @@ $result_trees{'float_long_captions'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index f7ebd32548..51fcfed794 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 40c7831d63..d8b8c1cdcf 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -35,7 +35,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -45,7 +46,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -57,7 +57,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -67,7 +68,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -79,7 +79,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -89,7 +90,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -101,7 +101,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -111,7 +112,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -123,7 +123,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -133,7 +134,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -145,7 +145,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -155,7 +156,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -167,7 +167,8 @@ $result_trees{'image_and_spaces_formatting'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -177,7 +178,6 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -200,7 +200,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 'Some text '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -210,7 +211,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -222,7 +222,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -232,7 +233,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -244,7 +244,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -254,7 +255,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -266,7 +266,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -276,7 +277,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -288,7 +288,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -298,7 +299,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -310,7 +310,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -320,7 +321,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -332,7 +332,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -342,7 +343,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -368,7 +368,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 'Some text '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -378,7 +379,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -390,7 +390,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text aaaaaaaaa '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -400,7 +401,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -412,7 +412,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text bbbbbbbbbbb '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -422,7 +423,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -434,7 +434,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text ccccccccccccc '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -444,7 +445,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -456,7 +456,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text ddddddddddddd '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -466,7 +467,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -478,7 +478,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text eeeeeeeeeeeeeee '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -488,7 +489,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -500,7 +500,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => ' text fffffffffff '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -510,7 +511,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -536,7 +536,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -546,7 +547,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -572,7 +572,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBB '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -582,7 +583,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -608,7 +608,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 'Text. '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -618,7 +619,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -630,7 +630,8 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => '       '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -640,7 +641,6 @@ $result_trees{'image_and_spaces_formatting'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index 13cf69a1db..bbb3fb62ff 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 16d6e8bb68..1239f86964 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 f4d6022604..0d1ab96f9e 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -30,7 +30,8 @@ $result_trees{'image_not_found'} = {
       'cmdname' => 'node',
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -40,7 +41,6 @@ $result_trees{'image_not_found'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 4bbf198e96..cb006327fd 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_encoded.pl 
b/tp/t/results/info_tests/image_text_encoded.pl
index 8af215723d..96f5a43445 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -46,7 +46,8 @@ $result_trees{'image_text_encoded'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -56,7 +57,6 @@ $result_trees{'image_text_encoded'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
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 2efe3e0f00..502da9e5d7 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/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index 25a47a1e81..962a611e44 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
@@ -64,7 +64,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -74,7 +75,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -89,7 +89,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -99,7 +100,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -151,12 +151,12 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -210,7 +210,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -220,7 +221,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -319,7 +319,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -329,7 +330,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -373,12 +373,12 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'text' => 'node'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -422,7 +422,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -432,7 +433,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -457,11 +457,13 @@ $result_trees{'invalid_node_name_no_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -471,7 +473,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -490,7 +491,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -500,7 +502,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -514,7 +515,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -523,19 +523,20 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -570,7 +571,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -580,11 +580,13 @@ $result_trees{'invalid_node_name_no_warning'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -594,7 +596,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -611,7 +612,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -646,11 +646,11 @@ 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'con
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'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'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'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_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 3425d74fa6..23169ce6dd 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -64,7 +64,8 @@ $result_trees{'invalid_node_name_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -74,7 +75,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -89,7 +89,8 @@ $result_trees{'invalid_node_name_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -99,7 +100,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -151,12 +151,12 @@ $result_trees{'invalid_node_name_warning'} = {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -210,7 +210,8 @@ $result_trees{'invalid_node_name_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -220,7 +221,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -319,7 +319,8 @@ $result_trees{'invalid_node_name_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -329,7 +330,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -373,12 +373,12 @@ $result_trees{'invalid_node_name_warning'} = {
               'text' => 'node'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -422,7 +422,8 @@ $result_trees{'invalid_node_name_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -432,7 +433,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 14
               }
@@ -457,11 +457,13 @@ $result_trees{'invalid_node_name_warning'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -471,7 +473,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -490,7 +491,8 @@ $result_trees{'invalid_node_name_warning'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -500,7 +502,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -514,7 +515,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -523,19 +523,20 @@ $result_trees{'invalid_node_name_warning'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'node'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'comma',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'comma',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -570,7 +571,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -580,11 +580,13 @@ $result_trees{'invalid_node_name_warning'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -594,7 +596,6 @@ $result_trees{'invalid_node_name_warning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -611,7 +612,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -646,11 +646,11 @@ 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'conten
 
$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'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'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_texis{'invalid_node_name_warning'} = '
 @node Top
diff --git a/tp/t/results/info_tests/multiline_image_and_align.pl 
b/tp/t/results/info_tests/multiline_image_and_align.pl
index 8bdee4ce73..6b3e1dcedb 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -14,7 +14,8 @@ $result_trees{'multiline_image_and_align'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -24,7 +25,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -65,7 +65,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'CCCC '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -75,7 +76,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -116,7 +116,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'fffffffffffffffffffffffffffffffffffffff '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -126,7 +127,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -167,7 +167,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'dddd '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +178,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -234,7 +234,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -244,7 +245,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -270,7 +270,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'BBB '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -280,7 +281,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -292,7 +292,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' gggg '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -302,7 +303,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -329,7 +329,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -339,7 +340,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -399,7 +399,8 @@ $result_trees{'multiline_image_and_align'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -441,7 +442,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -482,7 +482,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'CCCC '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -524,7 +525,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -565,7 +565,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'fffffffffffffffffffffffffffffffffffffff '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -607,7 +608,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -648,7 +648,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'dddd '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -690,7 +691,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -747,7 +747,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -789,7 +790,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -815,7 +815,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'BBB '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -857,7 +858,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -869,7 +869,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' gggg '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -911,7 +912,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -938,7 +938,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -980,7 +981,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
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 1aed19a12a..05f98fc1f7 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
@@ -279,7 +279,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'type' => 'index_entry_command'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -289,7 +290,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'anchor-in-multitable'
@@ -640,7 +640,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'text' => 'BTTTTTTt '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -650,7 +651,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'mark'
@@ -786,7 +786,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -804,7 +805,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -814,7 +814,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -832,7 +833,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -865,8 +865,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[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]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'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_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 4004815e49..77fffc76ce 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -74,7 +74,8 @@ $result_trees{'nested_footnotes_separate'} = {
               'text' => 'F'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -97,7 +98,8 @@ $result_trees{'nested_footnotes_separate'} = {
                           'text' => 'V'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -112,7 +114,6 @@ $result_trees{'nested_footnotes_separate'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 6
@@ -129,7 +130,6 @@ $result_trees{'nested_footnotes_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
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 411bc5aee5..4a060d31a9 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -168,7 +168,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               'text' => 'machin '
                                             },
                                             {
-                                              'args' => [
+                                              'cmdname' => 'anchor',
+                                              'contents' => [
                                                 {
                                                   'contents' => [
                                                     {
@@ -178,7 +179,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                                   'type' => 'brace_arg'
                                                 }
                                               ],
-                                              'cmdname' => 'anchor',
                                               'extra' => {
                                                 'is_target' => 1,
                                                 'normalized' => 'mark-inside'
@@ -371,7 +371,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               'text' => 'in tab '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -381,7 +382,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'mark'
@@ -539,7 +539,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -557,7 +558,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -567,7 +567,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -585,7 +586,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -617,8 +617,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
 };
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'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_texis{'nested_multitable_anchor_index'} = '@node Top
 
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index d1ef565cdb..7ad28f4148 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -40,7 +40,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '3 One '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -73,7 +73,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '5 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -116,7 +116,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '9 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -126,7 +127,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -149,7 +149,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '11 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -159,7 +160,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -182,7 +182,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '13 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -192,7 +193,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -215,7 +215,8 @@ $result_trees{'note_in_strong'} = {
               'text' => '15 '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -225,7 +226,6 @@ $result_trees{'note_in_strong'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 15
               }
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 74f8540c72..caa82a4f4a 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
@@ -40,7 +40,8 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'text' => 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 
vvvvvvvvvvvvvvvv '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'note_in_strong_end_of_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -73,7 +73,8 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'text' => 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 
vvvvvvvvvvvvvvvv '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -87,7 +88,6 @@ $result_trees{'note_in_strong_end_of_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 4a63703c9a..9349930c1d 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -62,7 +62,8 @@ $result_trees{'novalidate_empty_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'novalidate_empty_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -89,11 +89,13 @@ $result_trees{'novalidate_empty_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -103,7 +105,6 @@ $result_trees{'novalidate_empty_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -120,7 +121,6 @@ $result_trees{'novalidate_empty_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -205,7 +205,8 @@ $result_trees{'novalidate_empty_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +216,6 @@ $result_trees{'novalidate_empty_refs'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -243,8 +243,8 @@ $result_trees{'novalidate_empty_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 b85c8ae564..196f58f53b 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -163,7 +163,8 @@ $result_trees{'one_node_counted_elements'} = {
               'text' => 'anchor ref '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -173,7 +174,6 @@ $result_trees{'one_node_counted_elements'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'ref'
@@ -310,7 +310,8 @@ $result_trees{'one_node_counted_elements'} = {
               'text' => 'ref to ref '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -328,7 +329,6 @@ $result_trees{'one_node_counted_elements'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -412,7 +412,7 @@ $result_trees{'one_node_counted_elements'} = {
 
$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'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_texis{'one_node_counted_elements'} = 'Garbage
 @cindex before nodes
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 14a8950a31..7b4b9e4018 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -40,7 +40,8 @@ $result_trees{'pxref_test'} = {
               'text' => 'Hey ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -74,7 +75,6 @@ $result_trees{'pxref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -83,7 +83,8 @@ $result_trees{'pxref_test'} = {
               'text' => ') and continue ('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -130,7 +131,6 @@ $result_trees{'pxref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -140,7 +140,8 @@ $result_trees{'pxref_test'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -174,7 +175,6 @@ $result_trees{'pxref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -183,7 +183,8 @@ $result_trees{'pxref_test'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -230,7 +231,6 @@ $result_trees{'pxref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -259,14 +259,14 @@ $result_trees{'pxref_test'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$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_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 68271ca36a..a9c59f8a7c 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -69,7 +69,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +101,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 4
@@ -111,7 +111,8 @@ $result_trees{'quote_node_names_info'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 5
@@ -163,7 +163,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -194,7 +195,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 7
@@ -205,7 +205,8 @@ $result_trees{'quote_node_names_info'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -236,7 +237,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 8
@@ -257,7 +257,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 10
@@ -299,7 +299,8 @@ $result_trees{'quote_node_names_info'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -330,7 +331,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 11
@@ -351,7 +351,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -369,7 +370,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 13
@@ -390,11 +390,13 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -404,7 +406,6 @@ $result_trees{'quote_node_names_info'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 15
@@ -422,7 +423,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 15
@@ -446,7 +446,8 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 17
@@ -485,7 +485,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -524,7 +525,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 19
@@ -545,7 +545,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -584,7 +585,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 21
@@ -605,7 +605,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -659,7 +660,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 23
@@ -680,7 +680,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 25
@@ -755,7 +755,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -814,7 +815,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 27
@@ -835,7 +835,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -894,7 +895,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 29
@@ -915,7 +915,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -974,7 +975,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 31
@@ -1018,7 +1018,8 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'blah'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1028,7 +1029,6 @@ $result_trees{'quote_node_names_info'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 34
@@ -1099,7 +1099,8 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'blumpty'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1109,7 +1110,6 @@ $result_trees{'quote_node_names_info'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 35
@@ -1215,7 +1215,8 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'funny'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1225,7 +1226,6 @@ $result_trees{'quote_node_names_info'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 37
@@ -1244,7 +1244,8 @@ $result_trees{'quote_node_names_info'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1254,7 +1255,6 @@ $result_trees{'quote_node_names_info'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 37
@@ -1583,12 +1583,12 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'man'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 50
@@ -1641,12 +1641,12 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'direct'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 50
@@ -1776,7 +1776,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1786,7 +1787,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 53
@@ -1822,7 +1822,8 @@ $result_trees{'quote_node_names_info'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1832,7 +1833,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 54
@@ -1920,22 +1920,22 @@ $result_trees{'quote_node_names_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 63a0002632..65a2007e17 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -44,7 +44,8 @@ $result_trees{'ref_tests'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -75,7 +76,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -85,7 +85,8 @@ $result_trees{'ref_tests'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -116,7 +117,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -126,11 +126,13 @@ $result_trees{'ref_tests'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -161,7 +163,6 @@ $result_trees{'ref_tests'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -170,7 +171,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -195,7 +195,8 @@ $result_trees{'ref_tests'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -239,7 +240,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -249,7 +249,8 @@ $result_trees{'ref_tests'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -293,7 +294,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -303,11 +303,13 @@ $result_trees{'ref_tests'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -351,7 +353,6 @@ $result_trees{'ref_tests'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 11
                       }
@@ -360,7 +361,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -370,7 +370,8 @@ $result_trees{'ref_tests'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -414,7 +415,6 @@ $result_trees{'ref_tests'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -448,20 +448,20 @@ $result_trees{'ref_tests'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[3];
+$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_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 c011eb24fb..a8484cecf6 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
@@ -70,11 +70,13 @@ $result_trees{'similar_external_and_internal_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -84,7 +86,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -114,7 +115,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -124,11 +124,13 @@ $result_trees{'similar_external_and_internal_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -138,7 +140,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -171,7 +172,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -181,11 +181,13 @@ $result_trees{'similar_external_and_internal_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -195,7 +197,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -212,7 +213,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -222,11 +222,13 @@ $result_trees{'similar_external_and_internal_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -236,7 +238,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -253,7 +254,6 @@ $result_trees{'similar_external_and_internal_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -284,10 +284,10 @@ $result_trees{'similar_external_and_internal_node'} = {
 };
 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$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_texis{'similar_external_and_internal_node'} = '@node aa, (toto)bb
 
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 84df22d375..ebbea36027 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -17,7 +17,8 @@ $result_trees{'space_in_setfilename'} = {
                   'cmdname' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -28,7 +29,6 @@ $result_trees{'space_in_setfilename'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index af32973fd3..fdcbda78f8 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -68,7 +68,8 @@ $result_trees{'test_index'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ $result_trees{'test_index'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -186,12 +186,12 @@ $result_trees{'test_index'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'exclamdown',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'exclamdown',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -298,7 +298,8 @@ $result_trees{'test_index'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -308,7 +309,6 @@ $result_trees{'test_index'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 12
                               }
@@ -370,7 +370,8 @@ $result_trees{'test_index'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -379,8 +380,7 @@ $result_trees{'test_index'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'var'
+                          ]
                         }
                       ],
                       'type' => 'def_line_arg'
@@ -2841,7 +2841,8 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -2851,7 +2852,6 @@ $result_trees{'test_index'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'a-counting-anchor'
@@ -2896,7 +2896,7 @@ $result_trees{'test_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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];
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index d0ed5a4777..2b09b1d46c 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -37,7 +37,8 @@ $result_trees{'top_node_normalization'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -55,7 +56,6 @@ $result_trees{'top_node_normalization'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -64,7 +64,8 @@ $result_trees{'top_node_normalization'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -82,7 +83,6 @@ $result_trees{'top_node_normalization'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -211,8 +211,8 @@ $result_trees{'top_node_normalization'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_normalization'} = '@node ToP
diff --git a/tp/t/results/info_tests/xref_quote_long_item.pl 
b/tp/t/results/info_tests/xref_quote_long_item.pl
index 35431a0b0d..84ef1455c2 100644
--- a/tp/t/results/info_tests/xref_quote_long_item.pl
+++ b/tp/t/results/info_tests/xref_quote_long_item.pl
@@ -50,7 +50,8 @@ $result_trees{'xref_quote_long_item'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -63,7 +64,6 @@ $result_trees{'xref_quote_long_item'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -96,19 +96,20 @@ $result_trees{'xref_quote_long_item'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'xref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'Texinfo::Convert::Utils $tree = 
expand_verbatiminclude($registrar'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'comma',
+                                  'contents' => [
                                     {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'comma',
                                   'source_info' => {
                                     'line_nr' => 4
                                   }
@@ -117,12 +118,12 @@ $result_trees{'xref_quote_long_item'} = {
                                   'text' => ' $configuration_information'
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'comma',
+                                  'contents' => [
                                     {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'comma',
                                   'source_info' => {
                                     'line_nr' => 4
                                   }
@@ -175,7 +176,6 @@ $result_trees{'xref_quote_long_item'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'xref',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -247,11 +247,11 @@ $result_trees{'xref_quote_long_item'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'xref_quote_long_item'} = '@table @asis
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index 9d129c1d4e..c26d68983a 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -44,7 +44,8 @@ $result_trees{'xref_test'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -75,7 +76,6 @@ $result_trees{'xref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -84,7 +84,8 @@ $result_trees{'xref_test'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -115,7 +116,6 @@ $result_trees{'xref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -125,11 +125,13 @@ $result_trees{'xref_test'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'xref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -160,7 +162,6 @@ $result_trees{'xref_test'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'xref',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -169,7 +170,6 @@ $result_trees{'xref_test'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -179,7 +179,8 @@ $result_trees{'xref_test'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -223,7 +224,6 @@ $result_trees{'xref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -233,7 +233,8 @@ $result_trees{'xref_test'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -264,7 +265,6 @@ $result_trees{'xref_test'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -293,16 +293,16 @@ $result_trees{'xref_test'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[3];
+$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_texis{'xref_test'} = '
 @node Top
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 fc29d0d7e8..c44cc9bfb2 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -285,7 +285,8 @@ $result_trees{'customize_special_element'} = {
               'text' => 'Text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'customize_special_element'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 15
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 268d6298fd..42b3f1b7ed 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -170,12 +170,12 @@ $result_trees{'customize_translations'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -293,12 +293,12 @@ $result_trees{'customize_translations'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -484,12 +484,12 @@ $result_trees{'customize_translations'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 25
               }
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index addfc109bb..276e9f932b 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -26,7 +26,8 @@ $result_trees{'documentation_examples'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -55,7 +56,6 @@ $result_trees{'documentation_examples'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -64,7 +64,8 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -74,7 +75,6 @@ $result_trees{'documentation_examples'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -83,12 +83,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -97,12 +97,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -281,7 +281,8 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -291,7 +292,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -306,12 +306,12 @@ $result_trees{'documentation_examples'} = {
               'text' => ' p--n. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -320,12 +320,12 @@ $result_trees{'documentation_examples'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -335,7 +335,8 @@ $result_trees{'documentation_examples'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -353,13 +354,13 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 13
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -374,7 +375,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 13
@@ -388,7 +388,8 @@ $result_trees{'documentation_examples'} = {
           'type' => 'paragraph'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -398,7 +399,6 @@ $result_trees{'documentation_examples'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 14
@@ -411,7 +411,8 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -440,7 +441,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -450,7 +450,8 @@ $result_trees{'documentation_examples'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -460,7 +461,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -470,7 +470,8 @@ $result_trees{'documentation_examples'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -480,7 +481,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -500,11 +500,13 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -514,7 +516,6 @@ $result_trees{'documentation_examples'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -529,12 +530,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' a=b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -543,12 +544,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -557,7 +558,6 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -605,7 +605,8 @@ $result_trees{'documentation_examples'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -615,7 +616,6 @@ $result_trees{'documentation_examples'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -630,12 +630,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' c. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -644,12 +644,12 @@ $result_trees{'documentation_examples'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -659,7 +659,8 @@ $result_trees{'documentation_examples'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -675,7 +676,6 @@ $result_trees{'documentation_examples'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -779,7 +779,8 @@ $result_trees{'documentation_examples'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'email',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -795,7 +796,6 @@ $result_trees{'documentation_examples'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'email',
                   'source_info' => {
                     'line_nr' => 29
                   }
@@ -881,7 +881,8 @@ $result_trees{'documentation_examples'} = {
                   'text' => '{j'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sup',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -891,7 +892,6 @@ $result_trees{'documentation_examples'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sup',
                   'source_info' => {
                     'line_nr' => 33
                   }
@@ -979,7 +979,8 @@ $result_trees{'documentation_examples'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -989,7 +990,6 @@ $result_trees{'documentation_examples'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 36
                   }
@@ -1128,12 +1128,12 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -1153,12 +1153,12 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 45
               }
@@ -1300,12 +1300,12 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1325,12 +1325,12 @@ $result_trees{'documentation_examples'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1469,7 +1469,7 @@ $result_trees{'documentation_examples'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$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'}[15]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples'}{'contents'}[3];
 
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 c8e6e7351e..1e26ac93f6 100644
--- a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
+++ b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
@@ -26,7 +26,8 @@ $result_trees{'documentation_examples_texi2html'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -55,7 +56,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -64,7 +64,8 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -74,7 +75,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -83,12 +83,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -97,12 +97,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -281,7 +281,8 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sansserif',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -291,7 +292,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sansserif',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -306,12 +306,12 @@ $result_trees{'documentation_examples_texi2html'} = {
               'text' => ' p--n. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -320,12 +320,12 @@ $result_trees{'documentation_examples_texi2html'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -335,7 +335,8 @@ $result_trees{'documentation_examples_texi2html'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -353,13 +354,13 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 13
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -374,7 +375,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 13
@@ -388,7 +388,8 @@ $result_trees{'documentation_examples_texi2html'} = {
           'type' => 'paragraph'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -398,7 +399,6 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 14
@@ -411,7 +411,8 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -440,7 +441,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -450,7 +450,8 @@ $result_trees{'documentation_examples_texi2html'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -460,7 +461,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -470,7 +470,8 @@ $result_trees{'documentation_examples_texi2html'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -480,7 +481,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -500,11 +500,13 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -514,7 +516,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -529,12 +530,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' a=b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -543,12 +544,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 19
                       }
@@ -557,7 +558,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -605,7 +605,8 @@ $result_trees{'documentation_examples_texi2html'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sansserif',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -615,7 +616,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sansserif',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -630,12 +630,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' c. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -644,12 +644,12 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'equiv',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'equiv',
                       'source_info' => {
                         'line_nr' => 23
                       }
@@ -659,7 +659,8 @@ $result_trees{'documentation_examples_texi2html'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -675,7 +676,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 24
                       }
@@ -779,7 +779,8 @@ $result_trees{'documentation_examples_texi2html'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'email',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -795,7 +796,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'email',
                   'source_info' => {
                     'line_nr' => 29
                   }
@@ -881,7 +881,8 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'text' => '{j'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sup',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -891,7 +892,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sup',
                   'source_info' => {
                     'line_nr' => 33
                   }
@@ -979,7 +979,8 @@ $result_trees{'documentation_examples_texi2html'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -989,7 +990,6 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 36
                   }
@@ -1128,12 +1128,12 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -1153,12 +1153,12 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 45
               }
@@ -1300,12 +1300,12 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1325,12 +1325,12 @@ $result_trees{'documentation_examples_texi2html'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1469,7 +1469,7 @@ $result_trees{'documentation_examples_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$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'}[15]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples_texi2html'}{'contents'}[3];
 
diff --git a/tp/t/results/init_files_tests/modified_translation.pl 
b/tp/t/results/init_files_tests/modified_translation.pl
index 7408487490..fe52f3ceff 100644
--- a/tp/t/results/init_files_tests/modified_translation.pl
+++ b/tp/t/results/init_files_tests/modified_translation.pl
@@ -12,12 +12,12 @@ $result_trees{'modified_translation'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -75,12 +75,12 @@ $result_trees{'modified_translation'} = {
               'text' => 'fr '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -138,12 +138,12 @@ $result_trees{'modified_translation'} = {
               'text' => 'pt '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/init_files_tests/sc_formatting_with_css.pl 
b/tp/t/results/init_files_tests/sc_formatting_with_css.pl
index 046673c115..e40711edfc 100644
--- a/tp/t/results/init_files_tests/sc_formatting_with_css.pl
+++ b/tp/t/results/init_files_tests/sc_formatting_with_css.pl
@@ -19,7 +19,8 @@ $result_trees{'sc_formatting_with_css'} = {
                       'text' => 'In title '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -29,7 +30,6 @@ $result_trees{'sc_formatting_with_css'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -63,7 +63,8 @@ $result_trees{'sc_formatting_with_css'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -73,7 +74,6 @@ $result_trees{'sc_formatting_with_css'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -107,7 +107,8 @@ $result_trees{'sc_formatting_with_css'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'sc',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -117,7 +118,6 @@ $result_trees{'sc_formatting_with_css'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'sc',
                   'source_info' => {
                     'line_nr' => 6
                   }
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 2ddad19e3c..7d97ee123b 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
@@ -142,7 +142,8 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -157,7 +158,6 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 7
@@ -181,7 +181,8 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'text' => 'b'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -261,7 +262,6 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -285,7 +285,8 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'text' => 'c'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -299,7 +300,6 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -329,7 +329,8 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'text' => 'd'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -439,7 +440,6 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -474,8 +474,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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'quotation'}
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'authors'}[0]
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'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'}[0];
 
 $result_texis{'test_format_single_footnote_in_inline_content'} = '@node Top
 @top top
diff --git a/tp/t/results/invalid_nestings/accents.pl 
b/tp/t/results/invalid_nestings/accents.pl
index 8c81a26be1..72e7f65da6 100644
--- a/tp/t/results/invalid_nestings/accents.pl
+++ b/tp/t/results/invalid_nestings/accents.pl
@@ -16,16 +16,17 @@ $result_trees{'accents'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -34,7 +35,6 @@ $result_trees{'accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -43,7 +43,8 @@ $result_trees{'accents'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -77,11 +77,13 @@ $result_trees{'accents'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -91,7 +93,6 @@ $result_trees{'accents'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -100,7 +101,6 @@ $result_trees{'accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -109,11 +109,13 @@ $result_trees{'accents'} = {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -123,7 +125,6 @@ $result_trees{'accents'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'truc'
@@ -136,7 +137,6 @@ $result_trees{'accents'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index bbc7e8c7f1..0f96b40e60 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -12,7 +12,8 @@ $result_trees{'bad_style_nesting'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'bad_style_nesting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 2f3c4338f3..1f7ade4395 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -68,12 +68,12 @@ $result_trees{'bad_tab_nesting'} = {
 '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
diff --git a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl 
b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
index bc1089e850..2c0f45b322 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'cartouche_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'cartouche_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 6e67463516..a865568d0a 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -24,7 +24,8 @@ $result_trees{'center'} = {
                   'type' => 'ignorable_spaces_after_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -34,7 +35,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -44,7 +44,8 @@ $result_trees{'center'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -54,7 +55,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-anchor'
@@ -64,7 +64,8 @@ $result_trees{'center'} = {
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -79,7 +80,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -278,7 +278,8 @@ $result_trees{'center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -289,7 +290,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -328,7 +328,8 @@ $result_trees{'center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -338,7 +339,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -402,12 +402,12 @@ $result_trees{'center'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -756,7 +756,8 @@ $result_trees{'center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -766,7 +767,6 @@ $result_trees{'center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 33
                   }
@@ -825,12 +825,12 @@ $result_trees{'center'} = {
                   'text' => 'after first center '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 35
                   }
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index 275b47a349..e757f0e509 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'def_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'def_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl 
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index 5422a1cfe2..45da7d05c7 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'enumerate_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'enumerate_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/example_in_style_command.pl 
b/tp/t/results/invalid_nestings/example_in_style_command.pl
index edf6aaec37..8758514b2d 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'example_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'example_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl 
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index 6d7e972904..c424219818 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'float_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'float_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -71,7 +71,8 @@ $result_trees{'float_in_style_command'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ $result_trees{'float_in_style_command'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/invalid_nestings/flushright_in_style_command.pl 
b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
index fe9ff1bf18..01f69f0770 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'flushright_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'flushright_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 67e5207640..b9c367441a 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -37,7 +37,8 @@ $result_trees{'footnote_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -52,7 +53,8 @@ $result_trees{'footnote_in_ref'} = {
                       'text' => 'Text'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -81,7 +83,6 @@ $result_trees{'footnote_in_ref'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'source_info' => {
                         'line_nr' => 3
@@ -99,7 +100,6 @@ $result_trees{'footnote_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/invalid_nestings/heading_commands_in_center.pl 
b/tp/t/results/invalid_nestings/heading_commands_in_center.pl
index 7a4442de0a..87de814e6e 100644
--- a/tp/t/results/invalid_nestings/heading_commands_in_center.pl
+++ b/tp/t/results/invalid_nestings/heading_commands_in_center.pl
@@ -14,7 +14,8 @@ $result_trees{'heading_commands_in_center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'heading_commands_in_center'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git 
a/tp/t/results/invalid_nestings/heading_commands_in_documentlanguage.pl 
b/tp/t/results/invalid_nestings/heading_commands_in_documentlanguage.pl
index 7aff7e55f0..85623f3e56 100644
--- a/tp/t/results/invalid_nestings/heading_commands_in_documentlanguage.pl
+++ b/tp/t/results/invalid_nestings/heading_commands_in_documentlanguage.pl
@@ -14,7 +14,8 @@ $result_trees{'heading_commands_in_documentlanguage'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'heading_commands_in_documentlanguage'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git 
a/tp/t/results/invalid_nestings/heading_separator_in_accent_command.pl 
b/tp/t/results/invalid_nestings/heading_separator_in_accent_command.pl
index 1147d35e29..4c4e08de48 100644
--- a/tp/t/results/invalid_nestings/heading_separator_in_accent_command.pl
+++ b/tp/t/results/invalid_nestings/heading_separator_in_accent_command.pl
@@ -12,7 +12,8 @@ $result_trees{'heading_separator_in_accent_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'heading_separator_in_accent_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -53,7 +53,8 @@ $result_trees{'heading_separator_in_accent_command'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -63,7 +64,6 @@ $result_trees{'heading_separator_in_accent_command'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 3
                   }
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 70299e9953..f0737e7d9a 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -37,7 +37,8 @@ $result_trees{'ignore_in_xref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -120,7 +121,6 @@ $result_trees{'ignore_in_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -149,7 +149,7 @@ $result_trees{'ignore_in_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'ignore_in_xref'} = '@node first
 
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 9d0167085f..bfebb3f312 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -15,7 +15,8 @@ $result_trees{'in_errormsg'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -25,7 +26,6 @@ $result_trees{'in_errormsg'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'in-ref'
@@ -45,11 +45,13 @@ $result_trees{'in_errormsg'} = {
               'text' => 'Text. '
             },
             {
-              'args' => [
+              'cmdname' => 'errormsg',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -59,7 +61,6 @@ $result_trees{'in_errormsg'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'in-anchor'
@@ -73,7 +74,8 @@ $result_trees{'in_errormsg'} = {
                       'type' => 'spaces_after_close_brace'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -91,7 +93,6 @@ $result_trees{'in_errormsg'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -100,7 +101,6 @@ $result_trees{'in_errormsg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'errormsg',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -118,7 +118,8 @@ $result_trees{'in_errormsg'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'errormsg',
+          'contents' => [
             {
               'info' => {
                 'spaces_before_argument' => {
@@ -129,7 +130,6 @@ $result_trees{'in_errormsg'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'errormsg',
           'source_info' => {
             'line_nr' => 5
           }
@@ -242,7 +242,7 @@ $result_trees{'in_errormsg'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
 $result_texis{'in_errormsg'} = '
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 3b2d778fea..d059a4c210 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -183,7 +183,8 @@ $result_trees{'in_table'} = {
                               'type' => 'ignorable_spaces_after_command'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'titlefont',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -193,7 +194,6 @@ $result_trees{'in_table'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'titlefont',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 9
@@ -203,7 +203,8 @@ $result_trees{'in_table'} = {
                               'text' => ' '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -213,7 +214,6 @@ $result_trees{'in_table'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'in-anchor'
@@ -223,7 +223,8 @@ $result_trees{'in_table'} = {
                               }
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'footnote',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -238,7 +239,6 @@ $result_trees{'in_table'} = {
                                   'type' => 'brace_command_context'
                                 }
                               ],
-                              'cmdname' => 'footnote',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 9
@@ -299,7 +299,8 @@ $result_trees{'in_table'} = {
                           'text' => 'in item'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -314,7 +315,6 @@ $result_trees{'in_table'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
@@ -342,7 +342,8 @@ $result_trees{'in_table'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -369,7 +370,6 @@ $result_trees{'in_table'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 11
                               }
@@ -670,7 +670,8 @@ $result_trees{'in_table'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'option',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -680,7 +681,6 @@ $result_trees{'in_table'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'option',
                           'source_info' => {
                             'line_nr' => 19
                           }
@@ -775,7 +775,8 @@ $result_trees{'in_table'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'option',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -785,7 +786,6 @@ $result_trees{'in_table'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'option',
                           'source_info' => {
                             'line_nr' => 22
                           }
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 41e28f3531..9fe9f616fe 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -84,7 +84,8 @@ $result_trees{'item_in_ref'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -111,7 +112,6 @@ $result_trees{'item_in_ref'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'ref',
                           'source_info' => {
                             'line_nr' => 5
                           }
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 39171d9633..a0450749f1 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -37,7 +37,8 @@ $result_trees{'menu_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -48,7 +49,6 @@ $result_trees{'menu_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl 
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index a52a886440..d1c6b73fbd 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'multitable_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -27,7 +28,6 @@ $result_trees{'multitable_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index 60b3ef2f47..2b48626304 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -16,7 +16,8 @@ $result_trees{'on_block_command_line'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -26,7 +27,6 @@ $result_trees{'on_block_command_line'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'in-anchor'
@@ -45,7 +45,8 @@ $result_trees{'on_block_command_line'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -55,7 +56,6 @@ $result_trees{'on_block_command_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -85,7 +85,8 @@ $result_trees{'on_block_command_line'} = {
                           'type' => 'ignorable_spaces_after_command'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'titlefont',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -95,7 +96,6 @@ $result_trees{'on_block_command_line'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'titlefont',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 2
@@ -185,7 +185,8 @@ $result_trees{'on_block_command_line'} = {
                   'type' => 'ignorable_spaces_after_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -195,7 +196,6 @@ $result_trees{'on_block_command_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 5
@@ -205,7 +205,8 @@ $result_trees{'on_block_command_line'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -215,7 +216,6 @@ $result_trees{'on_block_command_line'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-quotation-anchor'
@@ -225,7 +225,8 @@ $result_trees{'on_block_command_line'} = {
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -240,7 +241,6 @@ $result_trees{'on_block_command_line'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 5
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 2b5ea37f64..a8b72eda12 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -21,7 +21,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -31,7 +32,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'in-anchor'
@@ -58,7 +58,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'titlefont',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -68,7 +69,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'titlefont',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 1
@@ -89,7 +89,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'footnote',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -104,7 +105,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_command_context'
                                 }
                               ],
-                              'cmdname' => 'footnote',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 1
@@ -168,7 +168,8 @@ $result_trees{'on_def_line'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'titlefont',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -178,7 +179,6 @@ $result_trees{'on_def_line'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'titlefont',
                           'extra' => {}
                         }
                       ],
@@ -207,7 +207,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -217,7 +218,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'in-anchorx'
@@ -244,7 +244,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'titlefont',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -254,7 +255,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'titlefont',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 2
@@ -275,7 +275,8 @@ $result_trees{'on_def_line'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'footnote',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -290,7 +291,6 @@ $result_trees{'on_def_line'} = {
                                   'type' => 'brace_command_context'
                                 }
                               ],
-                              'cmdname' => 'footnote',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 2
@@ -355,7 +355,8 @@ $result_trees{'on_def_line'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'titlefont',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -365,7 +366,6 @@ $result_trees{'on_def_line'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'titlefont',
                           'extra' => {}
                         }
                       ],
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index 4bd6e7d516..3f22a7a38c 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -24,7 +24,8 @@ $result_trees{'on_index_entry_line'} = {
                   'type' => 'ignorable_spaces_after_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -34,7 +35,6 @@ $result_trees{'on_index_entry_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -44,7 +44,8 @@ $result_trees{'on_index_entry_line'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -54,7 +55,6 @@ $result_trees{'on_index_entry_line'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-anchor'
@@ -64,7 +64,8 @@ $result_trees{'on_index_entry_line'} = {
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -79,7 +80,6 @@ $result_trees{'on_index_entry_line'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 2c61686298..34549f4b69 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -24,7 +24,8 @@ $result_trees{'on_itemize_line'} = {
                   'type' => 'ignorable_spaces_after_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -34,7 +35,6 @@ $result_trees{'on_itemize_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -44,7 +44,8 @@ $result_trees{'on_itemize_line'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -54,7 +55,6 @@ $result_trees{'on_itemize_line'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-anchor'
@@ -64,7 +64,8 @@ $result_trees{'on_itemize_line'} = {
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -79,7 +80,6 @@ $result_trees{'on_itemize_line'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index 4ecd8b8e9d..d980897605 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -15,7 +15,8 @@ $result_trees{'on_node_line'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -71,7 +72,6 @@ $result_trees{'on_node_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -85,7 +85,8 @@ $result_trees{'on_node_line'} = {
               'text' => '('
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -116,7 +117,6 @@ $result_trees{'on_node_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -128,7 +128,8 @@ $result_trees{'on_node_line'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -138,7 +139,6 @@ $result_trees{'on_node_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'in-anchor'
@@ -148,7 +148,8 @@ $result_trees{'on_node_line'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -163,7 +164,6 @@ $result_trees{'on_node_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
@@ -241,9 +241,9 @@ $result_trees{'on_node_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$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];
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 6bdccdfad8..9c9093528d 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -28,7 +28,8 @@ $result_trees{'on_section_line'} = {
               'text' => 'Text '
             },
             {
-              'args' => [
+              'cmdname' => 'titlefont',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -38,7 +39,6 @@ $result_trees{'on_section_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'titlefont',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
@@ -48,7 +48,8 @@ $result_trees{'on_section_line'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -58,7 +59,6 @@ $result_trees{'on_section_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'in-anchor'
@@ -68,7 +68,8 @@ $result_trees{'on_section_line'} = {
               }
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -83,7 +84,6 @@ $result_trees{'on_section_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 712ce9c4c4..b7456f992f 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -27,7 +27,8 @@ $result_trees{'on_subheading_line'} = {
                   'text' => 'Text '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -37,7 +38,6 @@ $result_trees{'on_subheading_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -47,7 +47,8 @@ $result_trees{'on_subheading_line'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -57,7 +58,6 @@ $result_trees{'on_subheading_line'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-anchor'
@@ -67,7 +67,8 @@ $result_trees{'on_subheading_line'} = {
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -82,7 +83,6 @@ $result_trees{'on_subheading_line'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 66500ff07b..2641965838 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -37,7 +37,8 @@ $result_trees{'quotation_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -56,7 +57,6 @@ $result_trees{'quotation_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/invalid_nestings/quotation_in_style_command.pl 
b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
index b17161fa84..341c4cee02 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -12,7 +12,8 @@ $result_trees{'quotation_in_style_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'quotation_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index a2dd367f55..f3052037d1 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -32,11 +32,13 @@ $result_trees{'ref_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -54,7 +56,6 @@ $result_trees{'ref_in_ref'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -71,7 +72,6 @@ $result_trees{'ref_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -96,8 +96,8 @@ $result_trees{'ref_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 85caa20153..1f029b6ccf 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
@@ -30,14 +30,16 @@ $result_trees{'ref_to_top_in_anchor'} = {
       'cmdname' => 'node',
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
                   'text' => 'TOP '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -55,7 +57,6 @@ $result_trees{'ref_to_top_in_anchor'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -64,7 +65,6 @@ $result_trees{'ref_to_top_in_anchor'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'TOP-Top'
@@ -90,7 +90,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'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_texis{'ref_to_top_in_anchor'} = '@node Top
 @anchor{TOP @ref{Top}}';
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index 0b28ed80b9..8a0ebcd2bb 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -20,7 +20,8 @@ $result_trees{'section_in_footnote'} = {
               'text' => 'Text'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'section_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index a94095403b..cd18c9188d 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -20,7 +20,8 @@ $result_trees{'section_in_math'} = {
               'text' => 'Some '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'section_in_math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -91,7 +91,8 @@ $result_trees{'section_in_math'} = {
               'text' => 'More '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'section_in_math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'info' => {
                 'spaces_before_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 9a87855121..0a38ff797f 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -14,12 +14,12 @@ $result_trees{'section_on_itemize_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'minus',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'minus',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -78,12 +78,12 @@ $result_trees{'section_on_itemize_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'minus',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'minus',
                   'source_info' => {
                     'line_nr' => 3
                   }
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 0e16be28ac..219988c796 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -60,7 +60,8 @@ $result_trees{'section_on_multitable_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -70,7 +71,6 @@ $result_trees{'section_on_multitable_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 3
                   }
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 2f34d5d0ab..db307fcf69 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
@@ -12,7 +12,8 @@ $result_trees{'style_not_closed_before_first_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'style_not_closed_before_first_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
index c891d7c630..811ad1d821 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
@@ -29,7 +29,8 @@ $result_trees{'style_not_closed_in_block_command'} = {
                   'text' => 'cartouche '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -40,7 +41,6 @@ $result_trees{'style_not_closed_in_block_command'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index a21f9f05d2..66f46545fa 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -77,7 +77,8 @@ $result_trees{'style_not_closed_in_table_line'} = {
                           'text' => 'line '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -87,7 +88,6 @@ $result_trees{'style_not_closed_in_table_line'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 4
                           }
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 c9580d5d69..7aa4710780 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -168,7 +168,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -179,7 +180,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -256,7 +256,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -267,7 +268,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 12
               }
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 15b11ec377..d6ec37c106 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -168,7 +168,8 @@ $result_trees{'style_not_closed_root_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'style_not_closed_root_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -261,7 +261,8 @@ $result_trees{'style_not_closed_root_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -277,7 +278,6 @@ $result_trees{'style_not_closed_root_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 13
               }
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index 3db00ccf32..5d243998e5 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -12,7 +12,8 @@ $result_trees{'table_in_code'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -27,7 +28,6 @@ $result_trees{'table_in_code'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git 
a/tp/t/results/invalid_nestings/thischapter_in_footnote_in_evenfooting.pl 
b/tp/t/results/invalid_nestings/thischapter_in_footnote_in_evenfooting.pl
index dbb8849e55..be7c00c6fa 100644
--- a/tp/t/results/invalid_nestings/thischapter_in_footnote_in_evenfooting.pl
+++ b/tp/t/results/invalid_nestings/thischapter_in_footnote_in_evenfooting.pl
@@ -22,14 +22,16 @@ $result_trees{'thischapter_in_footnote_in_evenfooting'} = {
                   'text' => 'aa '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'strong',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'GG'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -47,7 +49,6 @@ $result_trees{'thischapter_in_footnote_in_evenfooting'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 2
@@ -57,7 +58,6 @@ $result_trees{'thischapter_in_footnote_in_evenfooting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -72,7 +72,8 @@ $result_trees{'thischapter_in_footnote_in_evenfooting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -90,7 +91,6 @@ $result_trees{'thischapter_in_footnote_in_evenfooting'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
diff --git 
a/tp/t/results/invalid_nestings/thischapter_in_math_in_evenfooting.pl 
b/tp/t/results/invalid_nestings/thischapter_in_math_in_evenfooting.pl
index f39e7aeef3..e2d5149a74 100644
--- a/tp/t/results/invalid_nestings/thischapter_in_math_in_evenfooting.pl
+++ b/tp/t/results/invalid_nestings/thischapter_in_math_in_evenfooting.pl
@@ -19,7 +19,8 @@ $result_trees{'thischapter_in_math_in_evenfooting'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'math',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -32,7 +33,6 @@ $result_trees{'thischapter_in_math_in_evenfooting'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'math',
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git 
a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
index 51c9f44d4d..621f17a646 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
@@ -17,7 +17,8 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
                   'text' => 'name '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -29,7 +30,6 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ''
                   },
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
index 5b97f84a2a..146c62b5af 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
@@ -17,7 +17,8 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
                   'text' => 'name '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -28,7 +29,6 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => 'f'
                   },
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 a888b2bf83..b8258f7704 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
@@ -18,7 +18,8 @@ $result_trees{'unclosed_verb_on_section_line'} = {
               'text' => 'in section '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -40,7 +41,6 @@ $result_trees{'unclosed_verb_on_section_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => 'T'
               },
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 6012a3d5a0..6011424b06 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -37,7 +37,8 @@ $result_trees{'verbatim_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -56,7 +57,6 @@ $result_trees{'verbatim_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 2a8dd764f5..8c41e83c9a 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -14,7 +14,8 @@ $result_trees{'accent_argument'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -24,7 +25,6 @@ $result_trees{'accent_argument'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -115,7 +115,8 @@ $result_trees{'accent_argument'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -125,7 +126,6 @@ $result_trees{'accent_argument'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -216,7 +216,8 @@ $result_trees{'accent_argument'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -226,7 +227,6 @@ $result_trees{'accent_argument'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'info' => {
                     'spaces_after_cmd_before_arg' => {
                       'text' => ' '
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index cd8348d2d2..b2bb5435a5 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -148,7 +148,8 @@ $result_trees{'bad_enumerate_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -158,7 +159,6 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 7
                   }
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index a95f48ba81..adf89890a2 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -202,12 +202,12 @@ $result_trees{'empty_accent_argument'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 9
                   }
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 8b64fad7a3..d74aeaac56 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -421,12 +421,12 @@ $result_trees{'itemize_in_example'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'bullet',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'bullet',
                       'source_info' => {
                         'line_nr' => 20
                       }
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl 
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index 43d322d491..d5c38f5dff 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -14,12 +14,12 @@ $result_trees{'itemize_line_commands_with_brace'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'bullet',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -113,12 +113,12 @@ $result_trees{'itemize_line_commands_with_brace'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'minus',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'minus',
                   'source_info' => {
                     'line_nr' => 5
                   }
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 1d4750ea6b..06e0b0d2ff 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -14,12 +14,12 @@ $result_trees{'w_argument'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -46,7 +46,8 @@ $result_trees{'w_argument'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -56,7 +57,6 @@ $result_trees{'w_argument'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -86,7 +86,8 @@ $result_trees{'w_argument'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'option',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -96,7 +97,6 @@ $result_trees{'w_argument'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'option',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 3399116785..c7a59159cb 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -91,12 +91,12 @@ $result_trees{'command_translated'} = {
               'text' => 'top '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -121,12 +121,12 @@ $result_trees{'command_translated'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -162,12 +162,12 @@ $result_trees{'command_translated'} = {
               'text' => 'chapter '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index e70f1900c2..9812c07ee3 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -381,7 +381,8 @@ $result_trees{'documentlanguage'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -399,7 +400,6 @@ $result_trees{'documentlanguage'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
                 'line_nr' => 30
@@ -734,7 +734,7 @@ $result_trees{'documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'documentlanguage'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 22b54bed6f..77b92b2c53 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -381,7 +381,8 @@ $result_trees{'documentlanguage_option'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -399,7 +400,6 @@ $result_trees{'documentlanguage_option'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
                 'line_nr' => 30
@@ -734,7 +734,7 @@ $result_trees{'documentlanguage_option'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 ee820df71f..52be5219db 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -381,7 +381,8 @@ $result_trees{'documentlanguage_unknown'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -399,7 +400,6 @@ $result_trees{'documentlanguage_unknown'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'documentlanguage.texi',
                 'line_nr' => 30
@@ -734,7 +734,7 @@ $result_trees{'documentlanguage_unknown'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 0c927b8f00..2310bee83b 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -238,12 +238,12 @@ $result_trees{'multiple_documentlanguage'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'error',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'error',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -644,12 +644,12 @@ $result_trees{'multiple_documentlanguage'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 16
                       }
@@ -976,12 +976,12 @@ $result_trees{'multiple_documentlanguage'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 26
                       }
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 4820785575..40e3bef94c 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -238,12 +238,12 @@ $result_trees{'multiple_in_preamble'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'error',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'error',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -678,12 +678,12 @@ $result_trees{'multiple_in_preamble'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 18
                       }
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 f02532950c..09ac013e21 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -238,12 +238,12 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'error',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'error',
                               'source_info' => {
                                 'line_nr' => 5
                               }
@@ -727,12 +727,12 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'error',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'error',
                       'source_info' => {
                         'line_nr' => 22
                       }
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index bf74ab8822..d954bb40ef 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -668,7 +668,8 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'In japanese. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1020,7 +1020,8 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'In english. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1038,7 +1039,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -1786,7 +1786,8 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'In brazilian. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1804,7 +1805,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1837,12 +1837,12 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'
 
$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'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_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 2ad475244e..7f001301a1 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -668,7 +668,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'In japanese. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -1020,7 +1020,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'In english. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1038,7 +1039,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -1786,7 +1786,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'In brazilian. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1804,7 +1805,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1837,12 +1837,12 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'con
 
$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'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_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 5dd1f0d062..79c166e678 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -637,7 +637,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'In japanese. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -655,7 +656,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -989,7 +989,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'In english. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1007,7 +1008,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -1755,7 +1755,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'In brazilian. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1773,7 +1774,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 54
               }
@@ -1806,12 +1806,12 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{
 
$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'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_texis{'multiple_lang_chapters_texi2html'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index c67cccbebb..a119d1a337 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -179,7 +179,8 @@ $result_trees{'unknown_language'} = {
               'text' => 'Unknown language. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -197,7 +198,6 @@ $result_trees{'unknown_language'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -255,7 +255,8 @@ $result_trees{'unknown_language'} = {
               'text' => 'Another unknown language. '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -273,7 +274,6 @@ $result_trees{'unknown_language'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -301,8 +301,8 @@ $result_trees{'unknown_language'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_texis{'unknown_language'} = '@documentlanguage unknown
 
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 245a7bf065..0e454fff1c 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -23,7 +23,8 @@ $result_trees{'anchor_before_top'} = {
           'type' => 'preamble_before_content'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -33,7 +34,6 @@ $result_trees{'anchor_before_top'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'a-before-Top'
@@ -179,7 +179,8 @@ $result_trees{'anchor_before_top'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -197,7 +198,6 @@ $result_trees{'anchor_before_top'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -225,7 +225,7 @@ $result_trees{'anchor_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 4d762b0cb4..e9f3539477 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -31,7 +31,8 @@ $result_trees{'anchor_in_copying'} = {
                       'text' => 'Cop. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -44,7 +45,6 @@ $result_trees{'anchor_in_copying'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'a-in-copying'
@@ -230,7 +230,8 @@ $result_trees{'anchor_in_copying'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -248,7 +249,6 @@ $result_trees{'anchor_in_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -276,7 +276,7 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 b2136194db..fa3bc8baf1 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
@@ -31,7 +31,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                       'text' => 'Cop. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -44,7 +45,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'a-in-copying'
@@ -230,7 +230,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -248,7 +249,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -287,7 +287,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -305,7 +306,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -333,8 +333,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 535c1ac6c9..61e2cfb1a1 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
@@ -31,7 +31,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                       'text' => 'Cop. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -44,7 +45,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'a-in-copying'
@@ -157,7 +157,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   'cmdname' => 'page'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -170,7 +171,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'a-in-titlepage'
@@ -368,7 +368,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -386,7 +387,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 19
               }
@@ -396,7 +396,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -414,7 +415,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -442,8 +442,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 45ab4d1859..018e9acdff 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
@@ -31,7 +31,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                       'text' => 'Cop. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -44,7 +45,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'a-in-copying'
@@ -340,7 +340,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -358,7 +359,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -397,7 +397,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -415,7 +416,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -443,8 +443,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 c9f80ccfa3..c0fb56a034 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -46,7 +46,8 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -56,7 +57,6 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anch_003a-in-node-before'
@@ -154,7 +154,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anch_003a-in-node-top'
@@ -228,7 +228,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -238,7 +239,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anch_003a-in-node-after'
@@ -336,7 +336,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -346,7 +347,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anch_003a-in-chap'
@@ -403,7 +403,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 24
               }
@@ -431,7 +431,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -449,7 +450,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 25
               }
@@ -459,7 +459,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -477,7 +478,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -487,7 +487,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -505,7 +506,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -557,7 +557,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -575,7 +576,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -585,7 +585,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -603,7 +604,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -613,7 +613,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -631,7 +632,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -641,7 +641,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -659,7 +660,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -687,14 +687,14 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$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_texis{'anchor_links_xref_xrefautomaticsectiontitle'} = '@node node 
before
 
diff --git a/tp/t/results/latex_tests/backslash_math.pl 
b/tp/t/results/latex_tests/backslash_math.pl
index 890246dd38..2524329d42 100644
--- a/tp/t/results/latex_tests/backslash_math.pl
+++ b/tp/t/results/latex_tests/backslash_math.pl
@@ -15,7 +15,8 @@ $result_trees{'backslash_math'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,12 +29,12 @@ $result_trees{'backslash_math'} = {
                       'text' => ' b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'backslashchar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'backslashchar',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -45,7 +46,6 @@ $result_trees{'backslash_math'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 674e79ecbe..55a3cde056 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -32,7 +32,8 @@ $result_trees{'brace_in_index'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -42,7 +43,6 @@ $result_trees{'brace_in_index'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -165,7 +165,8 @@ $result_trees{'brace_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'math',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -175,7 +176,6 @@ $result_trees{'brace_in_index'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'math',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -218,7 +218,8 @@ $result_trees{'brace_in_index'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -228,7 +229,6 @@ $result_trees{'brace_in_index'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 13
                   }
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 c21fea9da1..559827ee22 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
@@ -54,7 +54,8 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -64,7 +65,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 2
                       }
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 5b039e740f..b2bc3b0611 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -125,7 +125,8 @@ $result_trees{'custom_headings'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -135,7 +136,6 @@ $result_trees{'custom_headings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 3
                       }
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 b215147493..db529d845d 100644
--- a/tp/t/results/latex_tests/custom_headings_and_comments.pl
+++ b/tp/t/results/latex_tests/custom_headings_and_comments.pl
@@ -115,7 +115,8 @@ $result_trees{'custom_headings_and_comments'} = {
                       'text' => '   '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -125,7 +126,6 @@ $result_trees{'custom_headings_and_comments'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 2
                       }
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 87b31e5ee4..da1c8a1114 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -107,7 +107,8 @@ $result_trees{'error_in_sectioning_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -126,7 +127,6 @@ $result_trees{'error_in_sectioning_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -135,12 +135,12 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => ' ('
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -177,7 +177,8 @@ $result_trees{'error_in_sectioning_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -196,7 +197,6 @@ $result_trees{'error_in_sectioning_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -205,12 +205,12 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => ' ('
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -241,12 +241,12 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => 'Describe '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 301c3ae488..c3fd03b0a9 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -171,7 +171,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -186,7 +187,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -200,7 +200,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +216,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -321,7 +321,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -336,7 +337,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -350,7 +350,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -365,7 +366,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -471,7 +471,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -486,7 +487,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -500,7 +500,8 @@ $result_trees{'float_and_refs'} = {
               'type' => 'spaces_after_close_brace'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -515,7 +516,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -621,7 +621,8 @@ $result_trees{'float_and_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -639,7 +640,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -649,7 +649,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -680,7 +681,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 28
               }
@@ -690,7 +690,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 29
               }
@@ -744,7 +744,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -800,7 +801,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -810,7 +810,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -879,7 +880,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 31
               }
@@ -899,7 +899,8 @@ $result_trees{'float_and_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -917,7 +918,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -927,7 +927,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -958,7 +959,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 34
               }
@@ -968,7 +968,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1012,7 +1013,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 35
               }
@@ -1022,7 +1022,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1078,7 +1079,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -1088,7 +1088,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1157,7 +1158,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -1177,7 +1177,8 @@ $result_trees{'float_and_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1195,7 +1196,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 39
               }
@@ -1205,7 +1205,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1236,7 +1237,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -1246,7 +1246,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1290,7 +1291,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 41
               }
@@ -1300,7 +1300,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1356,7 +1357,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 42
               }
@@ -1366,7 +1366,8 @@ $result_trees{'float_and_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1435,7 +1436,6 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 43
               }
@@ -1605,21 +1605,21 @@ 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'ex
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$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_texis{'float_and_refs'} = '@node Top
 @top top
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index aa57b7ca66..6de54f07dc 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -176,7 +176,8 @@ $result_trees{'indices'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -186,7 +187,6 @@ $result_trees{'indices'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -195,7 +195,8 @@ $result_trees{'indices'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -205,7 +206,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -393,7 +393,8 @@ $result_trees{'indices'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -403,7 +404,6 @@ $result_trees{'indices'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -448,7 +448,8 @@ $result_trees{'indices'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'math',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -464,7 +465,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'math',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -479,7 +479,8 @@ $result_trees{'indices'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -489,7 +490,6 @@ $result_trees{'indices'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -498,7 +498,8 @@ $result_trees{'indices'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -508,7 +509,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -531,11 +531,13 @@ $result_trees{'indices'} = {
             ],
             'index_ignore_chars' => '\\',
             'seealso' => {
-              'args' => [
+              'cmdname' => 'seealso',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -551,7 +553,6 @@ $result_trees{'indices'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -566,7 +567,8 @@ $result_trees{'indices'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -576,7 +578,6 @@ $result_trees{'indices'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -585,7 +586,8 @@ $result_trees{'indices'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -595,7 +597,6 @@ $result_trees{'indices'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -604,7 +605,6 @@ $result_trees{'indices'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'seealso',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -614,7 +614,8 @@ $result_trees{'indices'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -630,7 +631,6 @@ $result_trees{'indices'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -643,7 +643,8 @@ $result_trees{'indices'} = {
                       'text' => 'sub'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -659,7 +660,6 @@ $result_trees{'indices'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -674,7 +674,8 @@ $result_trees{'indices'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -684,7 +685,6 @@ $result_trees{'indices'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -693,7 +693,8 @@ $result_trees{'indices'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -703,7 +704,6 @@ $result_trees{'indices'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -800,7 +800,8 @@ $result_trees{'indices'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -810,7 +811,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 19
                   }
@@ -877,7 +877,8 @@ $result_trees{'indices'} = {
                   'text' => '\\some\\command for '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -887,7 +888,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 23
                   }
@@ -943,7 +943,8 @@ $result_trees{'indices'} = {
                   'text' => 'the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -953,7 +954,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 25
                   }
@@ -962,7 +962,8 @@ $result_trees{'indices'} = {
                   'text' => ' index '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -972,7 +973,6 @@ $result_trees{'indices'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 25
                   }
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index f8112f81e4..178cc5bbaa 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -176,7 +176,8 @@ $result_trees{'indices_disable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -186,7 +187,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -195,7 +195,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -205,7 +206,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -393,7 +393,8 @@ $result_trees{'indices_disable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -403,7 +404,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -448,7 +448,8 @@ $result_trees{'indices_disable_encoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'math',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -464,7 +465,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'math',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -479,7 +479,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -489,7 +490,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -498,7 +498,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '"',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -508,7 +509,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '"',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -531,11 +531,13 @@ $result_trees{'indices_disable_encoding'} = {
             ],
             'index_ignore_chars' => '\\',
             'seealso' => {
-              'args' => [
+              'cmdname' => 'seealso',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -551,7 +553,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -566,7 +567,8 @@ $result_trees{'indices_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -576,7 +578,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -585,7 +586,8 @@ $result_trees{'indices_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -595,7 +597,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -604,7 +605,6 @@ $result_trees{'indices_disable_encoding'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'seealso',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -614,7 +614,8 @@ $result_trees{'indices_disable_encoding'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sortas',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -630,7 +631,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'sortas',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -643,7 +643,8 @@ $result_trees{'indices_disable_encoding'} = {
                       'text' => 'sub'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'math',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -659,7 +660,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'math',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -674,7 +674,8 @@ $result_trees{'indices_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -684,7 +685,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -693,7 +693,8 @@ $result_trees{'indices_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '"',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -703,7 +704,6 @@ $result_trees{'indices_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '"',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -800,7 +800,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'type' => 'spaces_at_end'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'sortas',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -810,7 +811,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'sortas',
                   'source_info' => {
                     'line_nr' => 19
                   }
@@ -877,7 +877,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => '\\some\\command for '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -887,7 +888,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 23
                   }
@@ -943,7 +943,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => 'the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'r',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -953,7 +954,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'r',
                   'source_info' => {
                     'line_nr' => 25
                   }
@@ -962,7 +962,8 @@ $result_trees{'indices_disable_encoding'} = {
                   'text' => ' index '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'file',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -972,7 +973,6 @@ $result_trees{'indices_disable_encoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'file',
                   'source_info' => {
                     'line_nr' => 25
                   }
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 bbc35e6f2d..99508a4860 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
@@ -142,7 +142,8 @@ $result_trees{'informative_commands_in_top_node'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -152,7 +153,6 @@ $result_trees{'informative_commands_in_top_node'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 6
                   }
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 93608992b0..9e82d9ee7d 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -177,7 +177,8 @@ $result_trees{'node_before_top'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -195,7 +196,6 @@ $result_trees{'node_before_top'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -223,7 +223,7 @@ $result_trees{'node_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'node_before_top'} = '@node before Top
 
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 381ebb8edf..477c041429 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -26,7 +26,8 @@ $result_trees{'titlepage_no_title'} = {
               'cmdname' => 'titlepage',
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'titlefont',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -36,7 +37,6 @@ $result_trees{'titlepage_no_title'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'titlefont',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
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 816eeaee1b..0c438c5d1a 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -239,7 +239,8 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => ' author'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'footnote',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -351,7 +352,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                               'type' => 'brace_command_context'
                             }
                           ],
-                          'cmdname' => 'footnote',
                           'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
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 ef2d0ba9e9..c5246fdd0e 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -111,7 +111,8 @@ $result_trees{'top_no_sectioning_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'pxref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -129,7 +130,6 @@ $result_trees{'top_no_sectioning_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'pxref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -157,7 +157,7 @@ $result_trees{'top_no_sectioning_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'top_no_sectioning_command'} = '@node Top
 
diff --git a/tp/t/results/latex_tests/verb.pl b/tp/t/results/latex_tests/verb.pl
index bc526c4d07..e20eaead46 100644
--- a/tp/t/results/latex_tests/verb.pl
+++ b/tp/t/results/latex_tests/verb.pl
@@ -15,7 +15,8 @@ $result_trees{'verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -26,7 +27,6 @@ $result_trees{'verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '!'
               },
@@ -49,7 +49,8 @@ $result_trees{'verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -60,7 +61,6 @@ $result_trees{'verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '!'
               },
@@ -83,7 +83,8 @@ $result_trees{'verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ $result_trees{'verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '!'
               },
@@ -122,7 +122,8 @@ $result_trees{'verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -133,7 +134,6 @@ $result_trees{'verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '%'
               },
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 1422398ebf..725d738722 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -92,7 +92,8 @@ $result_trees{'no_monolithic'} = {
               'text' => 'Not monolitic manual'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'no_monolithic'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
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 98b6be8d17..c93348b531 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -92,7 +92,8 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'text' => 'Not monolitic manual'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -107,7 +108,6 @@ $result_trees{'no_monolithic_only_toc_out'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl 
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 1605a64b91..3651bf633b 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -323,7 +323,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -333,7 +334,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -370,7 +370,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -380,7 +381,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -417,7 +417,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -427,7 +428,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 15
                               }
@@ -583,7 +583,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -593,7 +594,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 19,
                                         'macro' => 'param'
@@ -614,7 +614,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -624,7 +625,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 19,
                                         'macro' => 'param'
@@ -661,7 +661,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -670,8 +671,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'var'
+                                  ]
                                 }
                               ],
                               'type' => 'def_line_arg'
@@ -777,7 +777,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -787,7 +788,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 22,
                                         'macro' => 'param'
@@ -808,7 +808,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -818,7 +819,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 22,
                                         'macro' => 'param'
@@ -855,7 +855,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -864,8 +865,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'var'
+                                  ]
                                 }
                               ],
                               'type' => 'def_line_arg'
@@ -898,7 +898,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'text' => 'If '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -908,7 +909,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 24
                               }
@@ -994,7 +994,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1004,7 +1005,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 26,
                                         'macro' => 'param'
@@ -1025,7 +1025,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1035,7 +1036,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 26,
                                         'macro' => 'param'
@@ -1072,7 +1072,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1081,8 +1082,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'var'
+                                  ]
                                 }
                               ],
                               'type' => 'def_line_arg'
@@ -1192,7 +1192,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'var',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1202,7 +1203,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'var',
                                       'source_info' => {
                                         'line_nr' => 29,
                                         'macro' => 'returns'
@@ -1223,7 +1223,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => 'code',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1233,7 +1234,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => 'code',
                                       'source_info' => {
                                         'line_nr' => 29,
                                         'macro' => 'returns'
@@ -1270,7 +1270,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                             {
                               'contents' => [
                                 {
-                                  'args' => [
+                                  'cmdname' => 'var',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1279,8 +1280,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                                       ],
                                       'type' => 'brace_container'
                                     }
-                                  ],
-                                  'cmdname' => 'var'
+                                  ]
                                 }
                               ],
                               'type' => 'def_line_arg'
@@ -1440,7 +1440,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'text' => 'If '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1450,7 +1451,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 33
                               }
@@ -1459,7 +1459,8 @@ $result_trees{'api_doc_with_linemacro'} = {
                               'text' => ' is not a valid axis of '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'var',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1469,7 +1470,6 @@ $result_trees{'api_doc_with_linemacro'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'var',
                               'source_info' => {
                                 'line_nr' => 33
                               }
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl 
b/tp/t/results/linemacro/brace_command_not_closed.pl
index 4890d2d639..87d930b8a3 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -111,7 +111,8 @@ $result_trees{'brace_command_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -127,7 +128,6 @@ $result_trees{'brace_command_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6,
                 'macro' => 'mycommand'
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index d0b1c28bc0..8697151513 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -255,12 +255,12 @@ now second arg: gg '
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 14,
                     'macro' => 'mymacro'
@@ -283,7 +283,8 @@ now second arg: gg '
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -293,7 +294,6 @@ now second arg: gg '
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 14,
                         'macro' => 'mymacro'
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index dcba797d06..6ef12f1b7c 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -380,7 +380,8 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                   'text' => 'now second arg: jj '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -390,7 +391,6 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 14,
                     'macro' => 'lm'
diff --git a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl 
b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
index 4b5fa3c903..752687149c 100644
--- a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
@@ -83,7 +83,8 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -155,7 +156,6 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index 21fb96bb8c..da6efb0f9e 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -126,7 +126,8 @@ something @comment in}'
               'text' => 'c '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -162,7 +163,6 @@ something @comment in}'
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 7,
                 'macro' => 'lm'
diff --git a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
index d661a3b92b..19af7b87d8 100644
--- a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
@@ -103,7 +103,8 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
               'text' => 'c '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +132,6 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'lm'
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl 
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index 47d56854ff..8fc07ff9b4 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -190,7 +190,8 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                               'text' => 'a'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -200,7 +201,6 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 9,
                                 'macro' => 'mylinecommand'
@@ -347,7 +347,8 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                           'text' => 'a'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -356,8 +357,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'code'
+                          ]
                         },
                         {
                           'text' => 'd'
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl 
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 49f1b6cfa3..2486c71846 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -139,7 +139,8 @@ $result_trees{'paragraph_no_paragraph'} = {
           'text' => ' '
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -149,7 +150,6 @@ $result_trees{'paragraph_no_paragraph'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'aa'
@@ -165,7 +165,8 @@ $result_trees{'paragraph_no_paragraph'} = {
               'text' => ', definite and '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -175,7 +176,6 @@ $result_trees{'paragraph_no_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'mycommand'
@@ -266,7 +266,8 @@ $result_trees{'paragraph_no_paragraph'} = {
               'text' => '  protected, in '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'paragraph_no_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 9,
                 'macro' => 'mycommand'
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index 980e92ceba..1b542fee29 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -182,7 +182,8 @@ $result_trees{'spaces_after_command_in_call'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -192,7 +193,6 @@ $result_trees{'spaces_after_command_in_call'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'info' => {
                                 'spaces_after_cmd_before_arg' => {
                                   'text' => ' '
@@ -235,7 +235,8 @@ $result_trees{'spaces_after_command_in_call'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ringaccent',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -245,7 +246,6 @@ $result_trees{'spaces_after_command_in_call'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => 'ringaccent',
                               'info' => {
                                 'spaces_after_cmd_before_arg' => {
                                   'text' => ' '
@@ -314,7 +314,8 @@ $result_trees{'spaces_after_command_in_call'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -324,7 +325,6 @@ $result_trees{'spaces_after_command_in_call'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'info' => {
                             'spaces_after_cmd_before_arg' => {
                               'text' => ' '
diff --git 
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl 
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 2479c0fc3f..54813c0860 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -337,7 +337,8 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                               'text' => ''
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'samp',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -347,7 +348,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'samp',
                               'source_info' => {
                                 'line_nr' => 15,
                                 'macro' => 'mymac'
@@ -391,7 +391,8 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                           'text' => ''
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -400,8 +401,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                               ],
                               'type' => 'brace_container'
                             }
-                          ],
-                          'cmdname' => 'samp'
+                          ]
                         }
                       ],
                       'info' => {
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index d1de2739fd..9dd0635867 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -234,7 +234,8 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'ringaccent',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -244,7 +245,6 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => 'ringaccent',
                               'info' => {
                                 'spaces_after_cmd_before_arg' => {
                                   'text' => ' '
diff --git a/tp/t/results/linemacro/text_arguments.pl 
b/tp/t/results/linemacro/text_arguments.pl
index 50fe22596d..05bdb28452 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -137,12 +137,12 @@ $result_trees{'text_arguments'} = {
               'text' => 'Z'
             },
             {
-              'args' => [
+              'cmdname' => 'bullet',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'bullet',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'nospace'
@@ -152,12 +152,12 @@ $result_trees{'text_arguments'} = {
               'text' => 'Y'
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'nospace'
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index 7d440f38e5..d2de539be4 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -191,7 +191,8 @@ $result_trees{'verb_in_linemacro_call'} = {
                       'text' => 'second '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -202,7 +203,6 @@ $result_trees{'verb_in_linemacro_call'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
@@ -219,7 +219,8 @@ $result_trees{'verb_in_linemacro_call'} = {
                       'text' => 'third A '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -230,7 +231,6 @@ $result_trees{'verb_in_linemacro_call'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '|'
                       },
diff --git a/tp/t/results/linemacro/verb_not_closed.pl 
b/tp/t/results/linemacro/verb_not_closed.pl
index 2f6f6c8bd4..3e9a78adda 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -111,7 +111,8 @@ $result_trees{'verb_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -140,7 +141,6 @@ $result_trees{'verb_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
diff --git a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
index 474957dfc9..6bedcd9dd9 100644
--- a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
@@ -110,7 +110,8 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -121,7 +122,6 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '@'
               },
diff --git a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
index 38d44cd1cf..0b2f26dca6 100644
--- a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
@@ -135,7 +135,8 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -146,7 +147,6 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 1a76617af3..8266fd6b27 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -2785,7 +2785,8 @@ $result_trees{'bib_example'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -2794,8 +2795,7 @@ $result_trees{'bib_example'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'References',
                           'sourcemark_type' => 'value_expansion',
@@ -3169,7 +3169,8 @@ $result_trees{'bib_example'} = {
               'text' => '(See item [LaTeX2e] in '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -3193,7 +3194,8 @@ $result_trees{'bib_example'} = {
                         {
                           'counter' => 2,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -3202,8 +3204,7 @@ $result_trees{'bib_example'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'References',
                           'sourcemark_type' => 'value_expansion',
@@ -3249,7 +3250,6 @@ $result_trees{'bib_example'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 43,
@@ -3401,7 +3401,8 @@ $result_trees{'bib_example'} = {
             {
               'counter' => 3,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3410,8 +3411,7 @@ $result_trees{'bib_example'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => 'References',
               'position' => 1,
@@ -3456,12 +3456,12 @@ $result_trees{'bib_example'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'file_name' => 'bib-example.texi',
                     'line_nr' => 49
@@ -3640,7 +3640,8 @@ $result_trees{'bib_example'} = {
                   'type' => 'ignorable_spaces_after_command'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -3650,7 +3651,6 @@ $result_trees{'bib_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'LaTeX2e'
@@ -3915,7 +3915,7 @@ $result_trees{'bib_example'} = {
 };
 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'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]{'args'}[0]{'contents'}[0];
 
 $result_texis{'bib_example'} = '\\input texinfo   @c -*-texinfo-*-
diff --git 
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl 
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index 4b308d6a53..f778deaeff 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -70,7 +70,8 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -113,7 +114,6 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -148,7 +148,8 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -170,7 +171,6 @@ after
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 53cd76ec34..4eb27aeaaa 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -263,7 +263,8 @@ macroseven defined
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -274,7 +275,6 @@ macroseven defined
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '%'
               },
@@ -839,7 +839,8 @@ macroseven defined
 '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -849,7 +850,6 @@ macroseven defined
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 41,
                 'macro' => 'macroseven'
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl 
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index b953213323..1d9a43df8d 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -357,7 +357,8 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -366,8 +367,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '#',
                   'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 76cb8d8189..05f6fe6d7b 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -114,7 +114,8 @@ arg}
               'text' => 'With a doubles arg a simple '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -128,7 +129,6 @@ arg}
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8,
                 'macro' => 'macrotwo'
@@ -142,7 +142,8 @@ arg}
               'text' => ' and re a simple '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ arg}
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8,
                 'macro' => 'macrotwo'
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index b0738c5778..2215953245 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -595,7 +595,8 @@ $result_trees{'glossary'} = {
               'text' => 'The '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -621,7 +622,6 @@ $result_trees{'glossary'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 42,
@@ -1035,7 +1035,8 @@ $result_trees{'glossary'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1061,7 +1062,6 @@ $result_trees{'glossary'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 43,
@@ -1514,7 +1514,8 @@ $result_trees{'glossary'} = {
               'text' => 'name2 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1524,7 +1525,6 @@ $result_trees{'glossary'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'id2'
@@ -1590,8 +1590,8 @@ $result_trees{'glossary'} = {
   'type' => 'document_root'
 };
 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'args'}[0]{'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_texis{'glossary'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index 311ea7065e..875a045e59 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -75,7 +75,8 @@ $result_trees{'ignored_macro_definition'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ in inlinefmt tex
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 96cb8a88bf..16b42e08d6 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -103,7 +103,8 @@ $result_trees{'implicit_quoting_one_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -113,7 +114,6 @@ $result_trees{'implicit_quoting_one_arg'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 6,
                 'macro' => 'FIXAME'
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl 
b/tp/t/results/macro/include_after_empty_line_arg.pl
index 6b1fd895c4..886774ac5c 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -98,12 +98,12 @@ $result_trees{'include_after_empty_line_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'mymacro'
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 6a2500e77a..db2b1e2cb2 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -269,7 +269,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phooindex',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -279,7 +280,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phooindex',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
@@ -340,7 +340,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -350,7 +351,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => 'phooindex'
               },
@@ -480,7 +480,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phooindex',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -490,7 +491,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phooindex',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
@@ -830,7 +830,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -840,7 +841,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => 'phooindex'
               },
@@ -897,7 +897,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -907,7 +908,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
@@ -1041,7 +1041,8 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1051,7 +1052,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'alias_of' => 'phooindex'
               },
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index 57eef5e165..e5af3081b4 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -73,7 +73,8 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl 
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index f883f29620..0349c60d62 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -73,7 +73,8 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl 
b/tp/t/results/macro/macro_call_in_node_manual.pl
index 086142a215..d65b2b6251 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -840,7 +840,8 @@ $result_trees{'macro_call_in_node_manual'} = {
                       'text' => 'begin'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -850,7 +851,6 @@ $result_trees{'macro_call_in_node_manual'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 31
                       },
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index f39be61a4e..d02671db4e 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -91,7 +91,8 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
               'text' => 'Para '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -119,7 +120,6 @@ still ignored',
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index 6f8b60648f..83ea70a02d 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -91,7 +91,8 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +132,6 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} 
= {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'tex'
diff --git 
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index 518c471514..acef75d0d8 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -73,7 +73,8 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index e7b43eb897..62cb051be5 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -91,7 +91,8 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
               'text' => 'Para '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -119,7 +120,6 @@ still ignored',
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'tex'
               },
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 3c0a5722b7..410535ea87 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -243,7 +243,8 @@ $result_trees{'macro_expansion'} = {
               'text' => 'comma in command. result of a macro with aaa '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -253,7 +254,6 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 11,
                 'macro' => 'macroone'
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl 
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index 7bc98f88a4..79c092869a 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -217,7 +217,8 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       'text' => 'k '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'emph',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -227,7 +228,6 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'emph',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -299,7 +299,8 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                       'text' => 'g c'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -309,7 +310,6 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 9,
                         'macro' => 'endbrace'
diff --git a/tp/t/results/macro/macro_for_verb.pl 
b/tp/t/results/macro/macro_for_verb.pl
index aa1c3b790a..def8b2fa7e 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -89,7 +89,8 @@ $result_trees{'macro_for_verb'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -121,7 +122,6 @@ $result_trees{'macro_for_verb'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '@'
               },
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index a6776ed003..5c767d98f5 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -128,7 +128,8 @@ $result_trees{'macro_in_accent'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -138,7 +139,6 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
@@ -179,7 +179,8 @@ $result_trees{'macro_in_accent'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -189,7 +190,6 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
@@ -229,7 +229,8 @@ $result_trees{'macro_in_accent'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -239,7 +240,6 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
@@ -279,7 +279,8 @@ $result_trees{'macro_in_accent'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -313,7 +314,6 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -333,7 +333,8 @@ $result_trees{'macro_in_accent'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -343,7 +344,6 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 8283f4152c..9d18f516e8 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -157,7 +157,8 @@ $result_trees{'macro_in_brace_command'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'email',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -223,7 +224,6 @@ $result_trees{'macro_in_brace_command'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'email',
                       'source_info' => {
                         'line_nr' => 10
                       }
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 704debeb0b..4e6a254f7a 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -827,7 +827,8 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'a '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -837,7 +838,6 @@ $result_trees{'macro_in_index_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 41,
                     'macro' => 'defcodeindexentry'
@@ -847,7 +847,8 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => ' t'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -857,7 +858,6 @@ $result_trees{'macro_in_index_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 41,
                     'macro' => 'defcodeindexentry'
@@ -867,11 +867,13 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -881,7 +883,6 @@ $result_trees{'macro_in_index_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 41,
                             'macro' => 'defcodeindexentry'
@@ -891,7 +892,6 @@ $result_trees{'macro_in_index_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 41,
                     'macro' => 'defcodeindexentry'
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl 
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index a7afeb798a..e400b09381 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -142,7 +142,8 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                       'text' => '* a5'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -177,7 +178,6 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 7
                       },
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 5360f04fb3..5fc50faf7b 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -1298,7 +1298,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1308,7 +1309,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => '//',
                 'end' => '\\\\'
@@ -1455,7 +1455,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phi',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1465,7 +1466,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phi',
               'extra' => {
                 'begin' => ':',
                 'end' => ':'
@@ -1623,7 +1623,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1633,7 +1634,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
@@ -1774,7 +1774,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1784,7 +1785,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'extra' => {
                 'begin' => '(strong:',
                 'end' => ':)'
@@ -1823,7 +1823,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1833,7 +1834,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 82
               }
@@ -1970,7 +1970,8 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1980,7 +1981,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'extra' => {
                 'code' => 1
               },
@@ -2017,7 +2017,8 @@ $result_trees{'macro_in_misc_commands'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -2027,7 +2028,6 @@ $result_trees{'macro_in_misc_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'extra' => {
                     'code' => 1
                   },
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index 138d4fe75e..1a992a3af6 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -68,7 +68,8 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -113,7 +114,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'flag'
               },
@@ -139,7 +139,8 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
               'text' => 'Again with space '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -184,7 +185,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'flag'
               },
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index 8e65e84006..c4e1b5f575 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -68,7 +68,8 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -112,7 +113,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'flag'
@@ -139,7 +139,8 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
               'text' => 'Again with space '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifclear',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -183,7 +184,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineifclear',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'flag'
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index fdfabf3d12..89c80730e2 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -117,7 +117,8 @@ $result_trees{'macro_name_with_hyphen'} = {
               'text' => 'This blah and that '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -127,7 +128,6 @@ $result_trees{'macro_name_with_hyphen'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macro-one'
diff --git a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl 
b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
index 49653886cd..1f9e223b17 100644
--- a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
+++ b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
@@ -113,7 +113,8 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -123,7 +124,6 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => ';',
                 'end' => ':'
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index 8da6b5d580..b1e5834bf3 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -126,11 +126,13 @@ $result_trees{'protect_in_body'} = {
               'text' => 'the result: '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -140,7 +142,6 @@ $result_trees{'protect_in_body'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 5,
                         'macro' => 'macroone'
@@ -150,7 +151,6 @@ $result_trees{'protect_in_body'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
@@ -160,7 +160,8 @@ $result_trees{'protect_in_body'} = {
               'text' => ' protected \\ -> \\arg1\\ '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -170,7 +171,6 @@ $result_trees{'protect_in_body'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
diff --git a/tp/t/results/macro/protect_in_body_line_arg.pl 
b/tp/t/results/macro/protect_in_body_line_arg.pl
index 4053cadcb2..a3169321b6 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -94,12 +94,12 @@ $result_trees{'protect_in_body_line_arg'} = {
               'text' => 'result: '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
@@ -109,12 +109,12 @@ $result_trees{'protect_in_body_line_arg'} = {
               'text' => ' protected \\ -> \\arg1\\ '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
@@ -131,7 +131,8 @@ $result_trees{'protect_in_body_line_arg'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -141,7 +142,6 @@ $result_trees{'protect_in_body_line_arg'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl 
b/tp/t/results/macro/protect_in_body_one_arg.pl
index 7cbc75365a..70ef70b1ff 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -112,11 +112,13 @@ $result_trees{'protect_in_body_one_arg'} = {
               'text' => 'result: '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -126,7 +128,6 @@ $result_trees{'protect_in_body_one_arg'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 5,
                         'macro' => 'macroone'
@@ -136,7 +137,6 @@ $result_trees{'protect_in_body_one_arg'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
@@ -146,12 +146,12 @@ $result_trees{'protect_in_body_one_arg'} = {
               'text' => ' protected \\ -> \\arg1\\ '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'macroone'
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index d02d74f4bc..c0e7f462a0 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -98,7 +98,8 @@ $result_trees{'redefine_texinfo_macro'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -108,7 +109,6 @@ $result_trees{'redefine_texinfo_macro'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 5,
                 'macro' => 'code'
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl 
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index 3da6a9dc5a..14ea08347c 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -122,7 +122,8 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
               'text' => 'first: '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -133,7 +134,6 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ','
               },
@@ -150,7 +150,8 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
               'text' => 'second: '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -161,7 +162,6 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '@'
               },
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl 
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index ec4540cd9e..0859bfe3f4 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -127,7 +127,8 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ':'
               },
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index 2b907455e3..42f46a025a 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -43,7 +43,8 @@ $result_trees{'bad_beginning'} = {
                       'text' => '*'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -53,7 +54,6 @@ $result_trees{'bad_beginning'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 5
                       }
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index c23d2c6bec..de6d679373 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -214,7 +214,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -232,7 +233,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -241,7 +241,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -259,7 +260,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -322,7 +322,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
           'cmdname' => 'nodedescriptionblock',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -332,7 +333,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'in-nodescription'
@@ -354,7 +354,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -372,7 +373,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -381,7 +381,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'text' => '. Footnote'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -396,7 +397,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 17
@@ -410,7 +410,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'text' => 'where the max column could be. '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -420,7 +421,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 18
                   }
@@ -504,7 +504,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'cmdname' => 'float',
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -514,7 +515,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -527,7 +527,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -542,7 +543,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
@@ -764,7 +764,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -782,7 +783,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -791,7 +791,8 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'text' => ', '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -809,7 +810,6 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 32
               }
@@ -1026,9 +1026,9 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
 };
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$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'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'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'}[3]{'extra'}{'node_description'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[5];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[5]{'extra'}{'caption'}
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[5]{'contents'}[2];
@@ -1036,8 +1036,8 @@ 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_
 
$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'}[5]{'extra'}{'float_section'};
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'commands_in_nodedescriptionblock'} = '@node Top
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index d0bb81ca5c..ebc5295eae 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -494,7 +494,8 @@ $result_trees{'formats_in_menu'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'acronym',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -508,7 +509,6 @@ $result_trees{'formats_in_menu'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'acronym',
                           'source_info' => {
                             'line_nr' => 21
                           }
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 4626382a60..ac9a2756bd 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -119,7 +119,8 @@ $result_trees{'inlineraw_in_menu_description'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'inlineraw',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -151,7 +152,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'inlineraw',
                           'extra' => {
                             'expand_index' => 1,
                             'format' => 'html'
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 93feca5735..282e2f27b0 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -66,7 +66,8 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => ')'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -76,7 +77,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -130,7 +130,8 @@ $result_trees{'invalid_info_menu_entry'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -140,7 +141,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -236,7 +236,8 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => ')'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -246,7 +247,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -321,7 +321,8 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => ')'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -331,7 +332,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -406,7 +406,8 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => ')'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -416,7 +417,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 8
                       }
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index 32356f7a7e..5b1cc0625f 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -65,7 +65,8 @@ $result_trees{'menu_entry_no_entry'} = {
                       'text' => '* a4'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -75,7 +76,6 @@ $result_trees{'menu_entry_no_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -88,7 +88,8 @@ $result_trees{'menu_entry_no_entry'} = {
                       'text' => '* a5'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -98,7 +99,6 @@ $result_trees{'menu_entry_no_entry'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 7
                       }
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 09668ac121..f65800253d 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -80,7 +80,8 @@ $result_trees{'menu_pointing_to_anchor'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -90,7 +91,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'An-anchor'
diff --git a/tp/t/results/menu/nodedescription_descriptions.pl 
b/tp/t/results/menu/nodedescription_descriptions.pl
index 59062a1b5c..44e1d79e53 100644
--- a/tp/t/results/menu/nodedescription_descriptions.pl
+++ b/tp/t/results/menu/nodedescription_descriptions.pl
@@ -519,7 +519,8 @@ $result_trees{'nodedescription_descriptions'} = {
                   'text' => 'toto is there:: and the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -529,13 +530,13 @@ $result_trees{'nodedescription_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 18
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -545,7 +546,6 @@ $result_trees{'nodedescription_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 18
                   }
@@ -554,7 +554,8 @@ $result_trees{'nodedescription_descriptions'} = {
                   'text' => ' and '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -565,7 +566,6 @@ $result_trees{'nodedescription_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -577,7 +577,8 @@ $result_trees{'nodedescription_descriptions'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -587,7 +588,6 @@ $result_trees{'nodedescription_descriptions'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'info' => {
                     'spaces_after_cmd_before_arg' => {
                       'text' => ' '
diff --git a/tp/t/results/menu/nodedescriptionblock_descriptions.pl 
b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
index 926a47098a..283bf9f9d3 100644
--- a/tp/t/results/menu/nodedescriptionblock_descriptions.pl
+++ b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
@@ -415,7 +415,8 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'text' => 'toto is there:: and the '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -425,13 +426,13 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 16
                   }
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -441,7 +442,6 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 16
                   }
@@ -450,7 +450,8 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'text' => ' and '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'verb',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -461,7 +462,6 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'verb',
                   'info' => {
                     'delimiter' => ':'
                   },
@@ -473,7 +473,8 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -483,7 +484,6 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'info' => {
                     'spaces_after_cmd_before_arg' => {
                       'text' => ' '
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index b6f9bbd7d8..204b4d0a53 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -64,7 +64,8 @@ $result_trees{'sc_in_menu'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -74,7 +75,6 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -89,7 +89,8 @@ $result_trees{'sc_in_menu'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -99,7 +100,6 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -124,7 +124,8 @@ $result_trees{'sc_in_menu'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -134,7 +135,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 5
                           }
@@ -165,7 +165,8 @@ $result_trees{'sc_in_menu'} = {
                       'type' => 'after_menu_description_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'sc',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -175,7 +176,6 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'sc',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -212,7 +212,8 @@ $result_trees{'sc_in_menu'} = {
                           'text' => '* '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -222,7 +223,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -231,7 +231,8 @@ $result_trees{'sc_in_menu'} = {
                           'text' => ':(dir)'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -241,7 +242,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -250,7 +250,8 @@ $result_trees{'sc_in_menu'} = {
                           'text' => '.   '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -260,7 +261,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -275,7 +275,8 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'empty_line'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -285,7 +286,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 12
                           }
@@ -394,7 +394,8 @@ $result_trees{'sc_in_menu'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -404,7 +405,6 @@ $result_trees{'sc_in_menu'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -463,7 +463,8 @@ $result_trees{'sc_in_menu'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -473,7 +474,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 20
                           }
@@ -497,7 +497,8 @@ $result_trees{'sc_in_menu'} = {
                           'text' => ')'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -507,7 +508,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 20
                           }
@@ -537,7 +537,8 @@ $result_trees{'sc_in_menu'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'sc',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -547,7 +548,6 @@ $result_trees{'sc_in_menu'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'sc',
                               'source_info' => {
                                 'line_nr' => 20
                               }
@@ -578,7 +578,8 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'after_menu_description_line'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'sc',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -588,7 +589,6 @@ $result_trees{'sc_in_menu'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'sc',
                           'source_info' => {
                             'line_nr' => 22
                           }
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 6158d09163..2f82554ff0 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -119,7 +119,8 @@ $result_trees{'verb_in_menu_description'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'verb',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -136,7 +137,6 @@ $result_trees{'verb_in_menu_description'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'verb',
                           'info' => {
                             'delimiter' => ':'
                           },
diff --git a/tp/t/results/misc_commands/clickstyle.pl 
b/tp/t/results/misc_commands/clickstyle.pl
index a81d03878b..9f3af4089b 100644
--- a/tp/t/results/misc_commands/clickstyle.pl
+++ b/tp/t/results/misc_commands/clickstyle.pl
@@ -37,12 +37,12 @@ $result_trees{'clickstyle'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'result'
               },
@@ -90,12 +90,12 @@ $result_trees{'clickstyle'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'equiv'
               },
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 4b8f837817..0b72a4f8a5 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -286,12 +286,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -311,19 +311,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'code: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -333,7 +334,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -353,19 +353,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'asis: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -375,7 +376,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -395,19 +395,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'strong: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -417,7 +418,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -437,19 +437,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'kbd: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -459,7 +460,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -479,19 +479,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'samp: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -501,7 +502,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -664,12 +664,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -689,19 +689,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'code: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -711,7 +712,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -731,19 +731,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'asis: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -753,7 +754,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -773,19 +773,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'strong: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -795,7 +796,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -815,19 +815,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'kbd: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -837,7 +838,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -857,19 +857,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'samp: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -879,7 +880,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1070,12 +1070,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1095,19 +1095,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => 'code: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -1117,7 +1118,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1137,19 +1137,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => 'asis: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -1159,7 +1160,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1179,19 +1179,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => 'strong: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -1201,7 +1202,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1221,19 +1221,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => 'kbd: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -1243,7 +1244,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1263,19 +1263,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                       'text' => 'samp: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'quotedblleft',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'quotedblleft',
                               'source_info' => {
                                 'line_nr' => 31,
                                 'macro' => 'quotes'
@@ -1285,7 +1286,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'quotes'
@@ -1600,12 +1600,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1625,19 +1625,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'code: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -1647,7 +1648,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1667,19 +1667,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'asis: '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -1689,7 +1690,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1709,19 +1709,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'strong: '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -1731,7 +1732,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1751,19 +1751,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'kbd: '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -1773,7 +1774,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1793,19 +1793,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'samp: '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -1815,7 +1816,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -1978,12 +1978,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2003,19 +2003,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'code: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2025,7 +2026,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2045,19 +2045,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'asis: '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2067,7 +2068,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2087,19 +2087,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'strong: '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2109,7 +2110,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2129,19 +2129,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'kbd: '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2151,7 +2152,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2171,19 +2171,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'samp: '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2193,7 +2194,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2384,12 +2384,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2409,19 +2409,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'code: '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2431,7 +2432,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2451,19 +2451,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'asis: '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2473,7 +2474,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2493,19 +2493,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'strong: '
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2515,7 +2516,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2535,19 +2535,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'kbd: '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2557,7 +2558,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2577,19 +2577,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
               'text' => 'samp: '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'quotedblleft',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'quotedblleft',
                       'source_info' => {
                         'line_nr' => 45,
                         'macro' => 'quotes'
@@ -2599,7 +2600,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 45,
                 'macro' => 'quotes'
@@ -2689,12 +2689,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -2714,19 +2714,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'code: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -2736,7 +2737,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -2756,19 +2756,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'asis: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -2778,7 +2779,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -2798,19 +2798,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'strong: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'strong',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -2820,7 +2821,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -2840,19 +2840,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'kbd: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -2862,7 +2863,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -2882,19 +2882,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'samp: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -2904,7 +2905,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3067,12 +3067,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3092,19 +3092,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'code: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3114,7 +3115,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3134,19 +3134,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'asis: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3156,7 +3157,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3176,19 +3176,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'strong: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'strong',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3198,7 +3199,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3218,19 +3218,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'kbd: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3240,7 +3241,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3260,19 +3260,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'samp: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3282,7 +3283,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3473,12 +3473,12 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'quotedblleft',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3498,19 +3498,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'code: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3520,7 +3521,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3540,19 +3540,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'asis: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3562,7 +3563,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3582,19 +3582,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'strong: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'strong',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3604,7 +3605,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3624,19 +3624,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'kbd: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3646,7 +3647,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
@@ -3666,19 +3666,20 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
                   'text' => 'samp: '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => '``simple-double--three---four----\'\' 
`simple\' quotedblleft: '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'quotedblleft',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'quotedblleft',
                           'source_info' => {
                             'line_nr' => 48,
                             'macro' => 'quotes'
@@ -3688,7 +3689,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'quotes'
diff --git a/tp/t/results/misc_commands/command_in_heading_footing.pl 
b/tp/t/results/misc_commands/command_in_heading_footing.pl
index fbe2a16814..a60be29e1e 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -82,7 +82,8 @@ $result_trees{'command_in_heading_footing'} = {
               'text' => 'In code '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'command_in_heading_footing'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git 
a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl 
b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
index 9cf14bf40c..6fee6f5d11 100644
--- a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
+++ b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
@@ -14,11 +14,6 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
             {
               'contents' => [
                 {
-                  'args' => [
-                    {
-                      'type' => 'brace_container'
-                    }
-                  ],
                   'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 1
@@ -46,7 +41,7 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
   'type' => 'document_root'
 };
 
-$result_texis{'command_not_closed_in_documentencoding'} = '@documentencoding 
@strong{}';
+$result_texis{'command_not_closed_in_documentencoding'} = '@documentencoding 
@strong';
 
 
 $result_texts{'command_not_closed_in_documentencoding'} = '';
@@ -67,10 +62,10 @@ $result_errors{'command_not_closed_in_documentencoding'} = [
     'type' => 'error'
   },
   {
-    'error_line' => 'bad argument to @documentencoding: @strong{}
+    'error_line' => 'bad argument to @documentencoding: @strong
 ',
     'line_nr' => 1,
-    'text' => 'bad argument to @documentencoding: @strong{}',
+    'text' => 'bad argument to @documentencoding: @strong',
     'type' => 'error'
   }
 ];
diff --git a/tp/t/results/misc_commands/command_not_closed_on_center_line.pl 
b/tp/t/results/misc_commands/command_not_closed_on_center_line.pl
index b198db6efa..521b3f7fb7 100644
--- a/tp/t/results/misc_commands/command_not_closed_on_center_line.pl
+++ b/tp/t/results/misc_commands/command_not_closed_on_center_line.pl
@@ -17,7 +17,8 @@ $result_trees{'command_not_closed_on_center_line'} = {
                   'text' => 'c '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'strong',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -28,7 +29,6 @@ $result_trees{'command_not_closed_on_center_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'strong',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/misc_commands/definfoenclose.pl 
b/tp/t/results/misc_commands/definfoenclose.pl
index ad072844d8..ce5b561dc8 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -64,7 +64,8 @@ $result_trees{'definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -74,7 +75,6 @@ $result_trees{'definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => '//',
                 'end' => '\\'
@@ -149,7 +149,8 @@ $result_trees{'definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phi',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -159,7 +160,6 @@ $result_trees{'definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phi',
               'extra' => {
                 'begin' => ':',
                 'end' => ':'
@@ -187,7 +187,8 @@ $result_trees{'definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -197,7 +198,6 @@ $result_trees{'definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -256,7 +256,8 @@ $result_trees{'definfoenclose'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -266,7 +267,6 @@ $result_trees{'definfoenclose'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'extra' => {
                 'begin' => '(strong:',
                 'end' => ':)'
diff --git a/tp/t/results/misc_commands/definfoenclose_nestings.pl 
b/tp/t/results/misc_commands/definfoenclose_nestings.pl
index 75ba31fbd3..bab33f34e6 100644
--- a/tp/t/results/misc_commands/definfoenclose_nestings.pl
+++ b/tp/t/results/misc_commands/definfoenclose_nestings.pl
@@ -51,11 +51,13 @@ $result_trees{'definfoenclose_nestings'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'phoo',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +67,6 @@ $result_trees{'definfoenclose_nestings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'phoo',
                       'extra' => {
                         'begin' => '//',
                         'end' => '\\'
@@ -82,7 +83,6 @@ $result_trees{'definfoenclose_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -102,11 +102,13 @@ $result_trees{'definfoenclose_nestings'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -116,7 +118,6 @@ $result_trees{'definfoenclose_nestings'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -125,7 +126,6 @@ $result_trees{'definfoenclose_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => '//',
                 'end' => '\\'
@@ -153,7 +153,8 @@ $result_trees{'definfoenclose_nestings'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -164,7 +165,6 @@ $result_trees{'definfoenclose_nestings'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => '//',
                 'end' => '\\'
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl 
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index 8df6ed63ee..ec1b208fee 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -59,7 +59,8 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
               'text' => 'My '
             },
             {
-              'args' => [
+              'cmdname' => 'headword',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -69,7 +70,6 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'headword',
               'extra' => {
                 'begin' => '',
                 'end' => ':'
diff --git a/tp/t/results/misc_commands/empty_center_with_arg.pl 
b/tp/t/results/misc_commands/empty_center_with_arg.pl
index aa53e32d12..979a4eee1d 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -14,12 +14,12 @@ $result_trees{'empty_center_with_arg'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 93a33faeac..2d78d4b6cc 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -17,7 +17,8 @@ $result_trees{'footnote_in_center'} = {
                   'text' => 'Centered text with a footnote'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -207,7 +208,6 @@ $result_trees{'footnote_in_center'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
@@ -242,7 +242,7 @@ $result_trees{'footnote_in_center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_in_center'} = '@center Centered text with a 
footnote@footnote{This footnote
 shows an important feature of the centered text.
diff --git a/tp/t/results/misc_commands/heading_command_in_commands.pl 
b/tp/t/results/misc_commands/heading_command_in_commands.pl
index ee35796968..af9d8328b0 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -17,7 +17,8 @@ $result_trees{'heading_command_in_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -55,7 +56,6 @@ $result_trees{'heading_command_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index 77102017de..cdcb5ad97c 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -40,7 +40,8 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl 
b/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
index 40204df130..a8a2aa2e90 100644
--- a/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
+++ b/tp/t/results/misc_commands/indent_in_command_in_paragraph.pl
@@ -15,7 +15,8 @@ $result_trees{'indent_in_command_in_paragraph'} = {
               'text' => 'In para '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -37,11 +37,13 @@ $result_trees{'indent_in_command_in_paragraph'} = {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'b',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -57,7 +59,6 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'b',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -66,7 +67,6 @@ $result_trees{'indent_in_command_in_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git 
a/tp/t/results/misc_commands/indent_with_command_after_without_space.pl 
b/tp/t/results/misc_commands/indent_with_command_after_without_space.pl
index 390756a26c..18cea9f503 100644
--- a/tp/t/results/misc_commands/indent_with_command_after_without_space.pl
+++ b/tp/t/results/misc_commands/indent_with_command_after_without_space.pl
@@ -18,12 +18,12 @@ $result_trees{'indent_with_command_after_without_space'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/misc_commands/indent_with_text_after_without_space.pl 
b/tp/t/results/misc_commands/indent_with_text_after_without_space.pl
index a437bdea4a..c4c07720f1 100644
--- a/tp/t/results/misc_commands/indent_with_text_after_without_space.pl
+++ b/tp/t/results/misc_commands/indent_with_text_after_without_space.pl
@@ -44,7 +44,8 @@ $result_trees{'indent_with_text_after_without_space'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -53,8 +54,7 @@ $result_trees{'indent_with_text_after_without_space'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'a',
                   'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/misc_commands/invalid_clickstyle.pl 
b/tp/t/results/misc_commands/invalid_clickstyle.pl
index e6d58b95b6..421040f5ed 100644
--- a/tp/t/results/misc_commands/invalid_clickstyle.pl
+++ b/tp/t/results/misc_commands/invalid_clickstyle.pl
@@ -42,12 +42,12 @@ $result_trees{'invalid_clickstyle'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'result'
               },
@@ -95,12 +95,12 @@ $result_trees{'invalid_clickstyle'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'nocmd'
               },
@@ -142,12 +142,12 @@ $result_trees{'invalid_clickstyle'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'click',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'click',
               'extra' => {
                 'clickstyle' => 'nocmd'
               },
diff --git a/tp/t/results/misc_commands/invalid_documentencoding.pl 
b/tp/t/results/misc_commands/invalid_documentencoding.pl
index ba4a336d64..bbc8623737 100644
--- a/tp/t/results/misc_commands/invalid_documentencoding.pl
+++ b/tp/t/results/misc_commands/invalid_documentencoding.pl
@@ -27,12 +27,12 @@ $result_trees{'invalid_documentencoding'} = {
                   'text' => 'us-ascii'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -73,7 +73,8 @@ $result_trees{'invalid_documentencoding'} = {
                   'text' => 'latin1'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -83,7 +84,6 @@ $result_trees{'invalid_documentencoding'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -277,12 +277,12 @@ $result_trees{'invalid_documentencoding'} = {
                       'text' => 'AAA'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'TeX',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'TeX',
                       'source_info' => {
                         'line_nr' => 10
                       }
@@ -318,7 +318,8 @@ $result_trees{'invalid_documentencoding'} = {
                       'text' => 'BBB'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -328,7 +329,6 @@ $result_trees{'invalid_documentencoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 11
                       }
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 5c739d4b88..1139ab3760 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -198,14 +198,16 @@ $result_trees{'kbdinputstyle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code out of example '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -215,7 +217,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 20,
                         'macro' => 'codekbdmacro'
@@ -225,7 +226,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20,
                 'macro' => 'codekbdmacro'
@@ -236,7 +236,8 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -246,7 +247,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'extra' => {
                 'code' => 1
               },
@@ -260,14 +260,16 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'kbd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -277,7 +279,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'extra' => {
                         'code' => 1
                       },
@@ -290,7 +291,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20,
                 'macro' => 'codekbdmacro'
@@ -301,21 +301,24 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'for nesting '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'r in code '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'kbd',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -325,7 +328,6 @@ $result_trees{'kbdinputstyle'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'kbd',
                               'extra' => {
                                 'code' => 1
                               },
@@ -338,7 +340,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 20,
                         'macro' => 'codekbdmacro'
@@ -348,7 +349,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 20,
                 'macro' => 'codekbdmacro'
@@ -392,14 +392,16 @@ $result_trees{'kbdinputstyle'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -409,7 +411,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 20,
                             'macro' => 'codekbdmacro'
@@ -419,7 +420,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'codekbdmacro'
@@ -430,7 +430,8 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -440,7 +441,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'extra' => {
                     'code' => 1
                   },
@@ -454,14 +454,16 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'kbd '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -471,7 +473,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'extra' => {
                             'code' => 1
                           },
@@ -487,7 +488,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'codekbdmacro'
@@ -498,21 +498,24 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'for nesting in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'r in code in example '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'kbd',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -522,7 +525,6 @@ $result_trees{'kbdinputstyle'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'kbd',
                                   'extra' => {
                                     'code' => 1
                                   },
@@ -535,7 +537,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'r',
                           'source_info' => {
                             'line_nr' => 20,
                             'macro' => 'codekbdmacro'
@@ -545,7 +546,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'codekbdmacro'
@@ -684,14 +684,16 @@ $result_trees{'kbdinputstyle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code out of example '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -701,7 +703,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 26,
                         'macro' => 'codekbdmacro'
@@ -711,7 +712,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'codekbdmacro'
@@ -722,7 +722,8 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -732,7 +733,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'extra' => {
                 'code' => 1
               },
@@ -746,14 +746,16 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'kbd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -763,7 +765,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'extra' => {
                         'code' => 1
                       },
@@ -776,7 +777,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'codekbdmacro'
@@ -787,21 +787,24 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'for nesting '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'r in code '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'kbd',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -811,7 +814,6 @@ $result_trees{'kbdinputstyle'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'kbd',
                               'extra' => {
                                 'code' => 1
                               },
@@ -824,7 +826,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 26,
                         'macro' => 'codekbdmacro'
@@ -834,7 +835,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'codekbdmacro'
@@ -878,14 +878,16 @@ $result_trees{'kbdinputstyle'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -895,7 +897,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 26,
                             'macro' => 'codekbdmacro'
@@ -905,7 +906,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 26,
                     'macro' => 'codekbdmacro'
@@ -916,7 +916,8 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -926,7 +927,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 26,
                     'macro' => 'codekbdmacro'
@@ -937,14 +937,16 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'kbd '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -954,7 +956,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 26,
                             'macro' => 'codekbdmacro'
@@ -967,7 +968,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 26,
                     'macro' => 'codekbdmacro'
@@ -978,21 +978,24 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'for nesting in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'r in code in example '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'kbd',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1002,7 +1005,6 @@ $result_trees{'kbdinputstyle'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'kbd',
                                   'source_info' => {
                                     'line_nr' => 26,
                                     'macro' => 'codekbdmacro'
@@ -1012,7 +1014,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'r',
                           'source_info' => {
                             'line_nr' => 26,
                             'macro' => 'codekbdmacro'
@@ -1022,7 +1023,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 26,
                     'macro' => 'codekbdmacro'
@@ -1161,14 +1161,16 @@ $result_trees{'kbdinputstyle'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code out of example '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1178,7 +1180,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 32,
                         'macro' => 'codekbdmacro'
@@ -1188,7 +1189,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32,
                 'macro' => 'codekbdmacro'
@@ -1199,7 +1199,8 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1209,7 +1210,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 32,
                 'macro' => 'codekbdmacro'
@@ -1220,14 +1220,16 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'kbd '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1237,7 +1239,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 32,
                         'macro' => 'codekbdmacro'
@@ -1247,7 +1248,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32,
                 'macro' => 'codekbdmacro'
@@ -1258,21 +1258,24 @@ $result_trees{'kbdinputstyle'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'for nesting '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'r in code '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'kbd',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1282,7 +1285,6 @@ $result_trees{'kbdinputstyle'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'kbd',
                               'source_info' => {
                                 'line_nr' => 32,
                                 'macro' => 'codekbdmacro'
@@ -1292,7 +1294,6 @@ $result_trees{'kbdinputstyle'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 32,
                         'macro' => 'codekbdmacro'
@@ -1302,7 +1303,6 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 32,
                 'macro' => 'codekbdmacro'
@@ -1346,14 +1346,16 @@ $result_trees{'kbdinputstyle'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1363,7 +1365,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 32,
                             'macro' => 'codekbdmacro'
@@ -1373,7 +1374,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 32,
                     'macro' => 'codekbdmacro'
@@ -1384,7 +1384,8 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1394,7 +1395,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 32,
                     'macro' => 'codekbdmacro'
@@ -1405,14 +1405,16 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'kbd '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1422,7 +1424,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 32,
                             'macro' => 'codekbdmacro'
@@ -1435,7 +1436,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 32,
                     'macro' => 'codekbdmacro'
@@ -1446,21 +1446,24 @@ $result_trees{'kbdinputstyle'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'for nesting in example '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'r',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
                                   'text' => 'r in code in example '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'kbd',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -1470,7 +1473,6 @@ $result_trees{'kbdinputstyle'} = {
                                       'type' => 'brace_container'
                                     }
                                   ],
-                                  'cmdname' => 'kbd',
                                   'source_info' => {
                                     'line_nr' => 32,
                                     'macro' => 'codekbdmacro'
@@ -1480,7 +1482,6 @@ $result_trees{'kbdinputstyle'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'r',
                           'source_info' => {
                             'line_nr' => 32,
                             'macro' => 'codekbdmacro'
@@ -1490,7 +1491,6 @@ $result_trees{'kbdinputstyle'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 32,
                     'macro' => 'codekbdmacro'
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index babe8bd2f4..999e9491b8 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -340,12 +340,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'extra' => {
                     'code' => 1
                   },
@@ -593,12 +593,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'extra' => {
                         'code' => 1
                       },
@@ -946,12 +946,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'extra' => {
                     'code' => 1
                   },
@@ -1195,12 +1195,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 31,
                         'macro' => 'codekbdmacro'
@@ -1540,12 +1540,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 37,
                     'macro' => 'codekbdmacro'
@@ -1785,12 +1785,12 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 37,
                         'macro' => 'codekbdmacro'
diff --git a/tp/t/results/misc_commands/nodedescription.pl 
b/tp/t/results/misc_commands/nodedescription.pl
index cf9ae869f0..1c0d48cf51 100644
--- a/tp/t/results/misc_commands/nodedescription.pl
+++ b/tp/t/results/misc_commands/nodedescription.pl
@@ -135,7 +135,8 @@ $result_trees{'nodedescription'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -145,7 +146,6 @@ $result_trees{'nodedescription'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'line_nr' => 9
                   }
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 4404bd135a..53bac52b64 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -141,7 +141,8 @@ $result_trees{'ref_in_center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -159,7 +160,6 @@ $result_trees{'ref_in_center'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -194,7 +194,8 @@ $result_trees{'ref_in_center'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -221,7 +222,6 @@ $result_trees{'ref_in_center'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -265,7 +265,7 @@ $result_trees{'ref_in_center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'ref_in_center'} = '@node Top
 @top top
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index f6c559fdac..40eb5968b5 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -124,7 +124,8 @@ $result_trees{'setfilename'} = {
                       'cmdname' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -135,7 +136,6 @@ $result_trees{'setfilename'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => ':'
                       },
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 62dabd47da..35d4a1eb36 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -264,7 +264,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -274,7 +275,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -284,7 +284,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -294,7 +295,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -304,7 +304,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -314,7 +315,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -324,7 +324,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -334,7 +335,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -345,7 +345,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -355,7 +356,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -365,7 +365,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -375,7 +376,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -385,7 +385,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -395,7 +396,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -405,7 +405,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -415,7 +416,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -426,7 +426,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -436,7 +437,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -447,19 +447,20 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'fff-- --- minus'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 21,
                         'macro' => 'testallowcodebreakspara'
@@ -469,7 +470,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'b aa-tt'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -479,7 +481,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 21,
                         'macro' => 'testallowcodebreakspara'
@@ -489,7 +490,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'ff_gg aa'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -499,7 +501,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 21,
                         'macro' => 'testallowcodebreakspara'
@@ -513,7 +514,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'anc-hor'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -523,7 +525,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'A-node0'
@@ -537,7 +538,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 21,
                 'macro' => 'testallowcodebreakspara'
@@ -597,7 +597,8 @@ $result_trees{'test_allowcodebreaks'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -607,7 +608,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 22,
                     'macro' => 'testallowcodebreaksexample'
@@ -736,7 +736,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -746,7 +747,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -756,7 +756,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -766,7 +767,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -776,7 +776,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -786,7 +787,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -796,7 +796,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -806,7 +807,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -817,7 +817,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -827,7 +828,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -837,7 +837,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -847,7 +848,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -857,7 +857,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -867,7 +868,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -877,7 +877,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -887,7 +888,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -898,7 +898,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -908,7 +909,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -919,19 +919,20 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'fff-- --- minus'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 26,
                         'macro' => 'testallowcodebreakspara'
@@ -941,7 +942,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'b aa-tt'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -951,7 +953,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 26,
                         'macro' => 'testallowcodebreakspara'
@@ -961,7 +962,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'ff_gg aa'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -971,7 +973,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 26,
                         'macro' => 'testallowcodebreakspara'
@@ -985,7 +986,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'anc-hor'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -995,7 +997,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'A-node1'
@@ -1009,7 +1010,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 26,
                 'macro' => 'testallowcodebreakspara'
@@ -1069,7 +1069,8 @@ $result_trees{'test_allowcodebreaks'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1079,7 +1080,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 27,
                     'macro' => 'testallowcodebreaksexample'
@@ -1149,7 +1149,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1180,7 +1181,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1190,7 +1192,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1200,7 +1201,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1210,7 +1212,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1220,7 +1221,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1230,7 +1232,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1240,7 +1241,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1250,7 +1252,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1261,7 +1262,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1271,7 +1273,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1281,7 +1282,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1291,7 +1293,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1301,7 +1302,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1311,7 +1313,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1321,7 +1322,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1331,7 +1333,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1342,7 +1343,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1352,7 +1354,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1363,19 +1364,20 @@ $result_trees{'test_allowcodebreaks'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
                               'text' => 'fff-- --- minus'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'minus',
+                              'contents' => [
                                 {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'minus',
                               'source_info' => {
                                 'line_nr' => 30,
                                 'macro' => 'testallowcodebreakspara'
@@ -1385,7 +1387,8 @@ $result_trees{'test_allowcodebreaks'} = {
                               'text' => 'b aa-tt'
                             },
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1395,7 +1398,6 @@ $result_trees{'test_allowcodebreaks'} = {
                                   'type' => 'following_arg'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'line_nr' => 30,
                                 'macro' => 'testallowcodebreakspara'
@@ -1405,7 +1407,8 @@ $result_trees{'test_allowcodebreaks'} = {
                               'text' => 'ff_gg aa'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'r',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1415,7 +1418,6 @@ $result_trees{'test_allowcodebreaks'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'r',
                               'source_info' => {
                                 'line_nr' => 30,
                                 'macro' => 'testallowcodebreakspara'
@@ -1429,7 +1431,8 @@ $result_trees{'test_allowcodebreaks'} = {
                               'text' => 'anc-hor'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'anchor',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1439,7 +1442,6 @@ $result_trees{'test_allowcodebreaks'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'anchor',
                               'extra' => {
                                 'is_target' => 1,
                                 'normalized' => 'A-nodew'
@@ -1453,7 +1455,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 30,
                         'macro' => 'testallowcodebreakspara'
@@ -1474,7 +1475,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 30
               }
@@ -1508,11 +1508,13 @@ $result_trees{'test_allowcodebreaks'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'w',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1522,7 +1524,6 @@ $result_trees{'test_allowcodebreaks'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 34
                           }
@@ -1531,7 +1532,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'w',
                   'source_info' => {
                     'line_nr' => 34
                   }
@@ -1649,7 +1649,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1659,7 +1660,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1669,7 +1669,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1679,7 +1680,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1689,7 +1689,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1699,7 +1700,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1709,7 +1709,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1719,7 +1720,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1730,7 +1730,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1740,7 +1741,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1750,7 +1750,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1760,7 +1761,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1770,7 +1770,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1780,7 +1781,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1790,7 +1790,8 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1800,7 +1801,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1811,7 +1811,8 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1821,7 +1822,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1832,19 +1832,20 @@ $result_trees{'test_allowcodebreaks'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'fff-- --- minus'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'minus',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'minus',
                       'source_info' => {
                         'line_nr' => 39,
                         'macro' => 'testallowcodebreakspara'
@@ -1854,7 +1855,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'b aa-tt'
                     },
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1864,7 +1866,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 39,
                         'macro' => 'testallowcodebreakspara'
@@ -1874,7 +1875,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'ff_gg aa'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'r',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1884,7 +1886,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'r',
                       'source_info' => {
                         'line_nr' => 39,
                         'macro' => 'testallowcodebreakspara'
@@ -1898,7 +1899,8 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'anc-hor'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1908,7 +1910,6 @@ $result_trees{'test_allowcodebreaks'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'A-node2'
@@ -1922,7 +1923,6 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 39,
                 'macro' => 'testallowcodebreakspara'
@@ -1982,7 +1982,8 @@ $result_trees{'test_allowcodebreaks'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1992,7 +1993,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 40,
                     'macro' => 'testallowcodebreaksexample'
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 247005348e..fcca0f4382 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -71,7 +71,8 @@ $result_trees{'anchor_in_footnote'} = {
               'text' => 'In top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -81,7 +82,8 @@ $result_trees{'anchor_in_footnote'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -91,7 +93,6 @@ $result_trees{'anchor_in_footnote'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -111,7 +112,6 @@ $result_trees{'anchor_in_footnote'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -298,7 +298,8 @@ $result_trees{'anchor_in_footnote'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -316,7 +317,6 @@ $result_trees{'anchor_in_footnote'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -345,7 +345,7 @@ $result_trees{'anchor_in_footnote'} = {
   'type' => 'document_root'
 };
 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 226faa5277..fc67638b1d 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -105,7 +105,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'text' => 'In top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -115,7 +116,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -125,7 +127,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -145,7 +146,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -332,7 +332,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -350,7 +351,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -379,7 +379,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
   'type' => 'document_root'
 };
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 713f979699..11020f956b 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
@@ -110,7 +110,8 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'text' => 'In top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -120,7 +121,8 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -130,7 +132,6 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -150,7 +151,6 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -337,7 +337,8 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -355,7 +356,6 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -384,7 +384,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
   'type' => 'document_root'
 };
 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 645b354c31..966a08bf0c 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -76,7 +76,8 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'text' => 'In top node'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,8 @@ $result_trees{'anchor_in_footnote_split_node'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'anchor',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -96,7 +98,6 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'anchor',
                           'extra' => {
                             'is_target' => 1,
                             'normalized' => 'Anchor-in-footnote'
@@ -116,7 +117,6 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -303,7 +303,8 @@ $result_trees{'anchor_in_footnote_split_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -321,7 +322,6 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -350,7 +350,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
   'type' => 'document_root'
 };
 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_texis{'anchor_in_footnote_split_node'} = '@node Top
 @top Top
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 fc4b4ba9bf..abfa901587 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -326,7 +326,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -370,7 +371,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 14
@@ -381,7 +381,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -412,7 +413,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 15
@@ -423,7 +423,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -467,7 +468,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 16
@@ -478,7 +478,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -509,7 +510,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 17
@@ -520,7 +520,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -556,7 +557,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 18
@@ -611,7 +611,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -629,7 +630,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 22
@@ -640,7 +640,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -658,7 +659,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 23
@@ -669,7 +669,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -692,7 +693,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 24
@@ -703,7 +703,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -726,7 +727,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 25
@@ -1365,16 +1365,16 @@ $result_trees{'character_and_spaces_in_refs'} = {
 };
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'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'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[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];
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 ebb50c961d..860f73e37a 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
@@ -334,7 +334,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -378,7 +379,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 14
@@ -389,7 +389,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -420,7 +421,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -475,7 +476,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 16
@@ -486,7 +486,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -517,7 +518,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 17
@@ -528,7 +528,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -564,7 +565,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 18
@@ -619,7 +619,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -637,7 +638,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 22
@@ -648,7 +648,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -666,7 +667,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 23
@@ -677,7 +677,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -700,7 +701,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 24
@@ -711,7 +711,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
 '
               },
               {
-                'args' => [
+                'cmdname' => 'ref',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -734,7 +735,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'brace_arg'
                   }
                 ],
-                'cmdname' => 'ref',
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 25
@@ -1400,16 +1400,16 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[1] = $resu
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$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'}[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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$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];
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index f5c0f88070..f523a2325b 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -23,7 +23,8 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -33,7 +34,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -89,7 +89,8 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -99,7 +100,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -230,7 +230,8 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -240,7 +241,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -359,7 +359,8 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'text' => 'Ref to node '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -377,7 +378,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 15
               }
@@ -418,11 +418,13 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -432,7 +434,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 17
                       }
@@ -449,7 +450,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -480,8 +480,8 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
 };
 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'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_texis{'equivalent_nodes_defined_linked'} = '@node Top, @asis{chap}
 
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index 39f5f79822..e0a5884db2 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -78,7 +78,8 @@ $result_trees{'no_element'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -88,7 +89,6 @@ $result_trees{'no_element'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'An-anchor'
@@ -114,7 +114,8 @@ $result_trees{'no_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -156,7 +156,8 @@ $result_trees{'no_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -174,7 +175,6 @@ $result_trees{'no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -194,7 +194,8 @@ $result_trees{'no_element'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -212,7 +213,8 @@ $result_trees{'no_element'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -222,7 +224,6 @@ $result_trees{'no_element'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-footnote'
@@ -248,7 +249,8 @@ $result_trees{'no_element'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -266,7 +268,6 @@ $result_trees{'no_element'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'ref',
                           'source_info' => {
                             'line_nr' => 18
                           }
@@ -282,7 +283,6 @@ $result_trees{'no_element'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 13
@@ -391,7 +391,8 @@ $result_trees{'no_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -409,7 +410,6 @@ $result_trees{'no_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -567,10 +567,10 @@ $result_trees{'no_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_element'} = '@settitle no_element test
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 00806ee057..7df9dc1b4e 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -340,7 +340,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -358,7 +359,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -368,7 +368,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -386,7 +387,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 23
               }
@@ -438,7 +438,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -456,7 +457,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 26
               }
@@ -466,7 +466,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -484,7 +485,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 27
               }
@@ -517,10 +517,10 @@ $result_trees{'nodes_before_after_top_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$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_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 1b400fa2a9..bcdfa1f4f1 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
@@ -76,7 +76,8 @@ $result_trees{'nodes_no_section_footnote_no_top_node_output'} 
= {
               'text' => 'a'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -91,7 +92,6 @@ $result_trees{'nodes_no_section_footnote_no_top_node_output'} 
= {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
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 95bb586902..4c637df765 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
@@ -41,7 +41,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -63,7 +65,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -80,7 +81,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -108,7 +108,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -120,7 +121,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -130,7 +132,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -147,7 +148,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -377,7 +377,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -389,7 +390,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -399,7 +401,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -416,7 +417,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 8
               }
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 b593e6db23..9f310832d9 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
@@ -41,7 +41,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -63,7 +65,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -80,7 +81,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -108,7 +108,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -120,7 +121,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -130,7 +132,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -147,7 +148,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -377,7 +377,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -389,7 +390,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -399,7 +401,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -416,7 +417,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 2d81804688..fa4cff8664 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -10,7 +10,8 @@ $result_trees{'placed_things_before_element'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'placed_things_before_element'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'An-anchor'
@@ -46,7 +46,8 @@ $result_trees{'placed_things_before_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -88,7 +88,8 @@ $result_trees{'placed_things_before_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -106,7 +107,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -126,7 +126,8 @@ $result_trees{'placed_things_before_element'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,8 @@ $result_trees{'placed_things_before_element'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -154,7 +156,6 @@ $result_trees{'placed_things_before_element'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-footnote'
@@ -180,7 +181,8 @@ $result_trees{'placed_things_before_element'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -198,7 +200,6 @@ $result_trees{'placed_things_before_element'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'ref',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -214,7 +215,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -323,7 +323,8 @@ $result_trees{'placed_things_before_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -341,7 +342,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -532,7 +532,8 @@ $result_trees{'placed_things_before_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -550,7 +551,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -574,7 +574,8 @@ $result_trees{'placed_things_before_element'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -592,7 +593,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -620,13 +620,13 @@ $result_trees{'placed_things_before_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'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_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 b125b23007..985a74b855 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
@@ -10,7 +10,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'An-anchor'
@@ -46,7 +46,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -88,7 +88,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -106,7 +107,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -126,7 +126,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -154,7 +156,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-footnote'
@@ -180,7 +181,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -198,7 +200,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'ref',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -214,7 +215,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -323,7 +323,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -341,7 +342,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -532,7 +532,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -550,7 +551,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 33
               }
@@ -574,7 +574,8 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -592,7 +593,6 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 36
               }
@@ -620,13 +620,13 @@ $result_trees{'placed_things_before_element_no_use_node'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element_no_use_node'}{'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'}[5]{'contents'}[1]{'contents'}[0]{'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]{'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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'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_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 ca00efeb9b..9f0ed8e523 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -13,7 +13,8 @@ $result_trees{'placed_things_before_node'} = {
           'type' => 'preamble_before_content'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -23,7 +24,6 @@ $result_trees{'placed_things_before_node'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'An-anchor'
@@ -49,7 +49,8 @@ $result_trees{'placed_things_before_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -67,7 +68,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -91,7 +91,8 @@ $result_trees{'placed_things_before_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -109,7 +110,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -129,7 +129,8 @@ $result_trees{'placed_things_before_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -147,7 +148,8 @@ $result_trees{'placed_things_before_node'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -157,7 +159,6 @@ $result_trees{'placed_things_before_node'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Anchor-in-footnote'
@@ -183,7 +184,8 @@ $result_trees{'placed_things_before_node'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'ref',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -201,7 +203,6 @@ $result_trees{'placed_things_before_node'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'ref',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -217,7 +218,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -326,7 +326,8 @@ $result_trees{'placed_things_before_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -344,7 +345,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 22
               }
@@ -632,7 +632,8 @@ $result_trees{'placed_things_before_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -650,7 +651,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 37
               }
@@ -674,7 +674,8 @@ $result_trees{'placed_things_before_node'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -692,7 +693,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 40
               }
@@ -720,13 +720,13 @@ $result_trees{'placed_things_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'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_texis{'placed_things_before_node'} = '@anchor{An anchor}
 
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index de80fe3d3d..ea3124f67b 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -865,7 +865,8 @@ $result_trees{'special_spaces_in_nodes'} = {
         {
           "contents" => [
             {
-              "args" => [
+              "cmdname" => "ref",
+              "contents" => [
                 {
                   "contents" => [
                     {
@@ -883,7 +884,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "brace_arg"
                 }
               ],
-              "cmdname" => "ref",
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 36
@@ -934,7 +934,7 @@ 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents
 
$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"}[12]{"contents"}[1]{"contents"}[0]{"args"}[0]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"args"}[0]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"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_texis{'special_spaces_in_nodes'} = '
 @node Top  
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index d5bee99a00..d9444e3738 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -157,7 +157,8 @@ $result_trees{'empty_headitem'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -167,7 +168,6 @@ $result_trees{'empty_headitem'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -196,7 +196,8 @@ $result_trees{'empty_headitem'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -206,7 +207,6 @@ $result_trees{'empty_headitem'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index c0189abc21..cd1d5cb223 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -17,7 +17,8 @@ $result_trees{'prototype_no_brace'} = {
                   'text' => 'aa'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'prototype_no_brace'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 894510ee13..60406012eb 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -30,7 +30,8 @@ $result_trees{'ref_in_multitable'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'ref_in_multitable'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -154,7 +154,8 @@ $result_trees{'ref_in_multitable'} = {
                               'text' => 'See '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -172,7 +173,6 @@ $result_trees{'ref_in_multitable'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 8
                               }
@@ -237,7 +237,8 @@ $result_trees{'ref_in_multitable'} = {
                               'text' => 'See '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'ref',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -255,7 +256,6 @@ $result_trees{'ref_in_multitable'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'ref',
                               'source_info' => {
                                 'line_nr' => 10
                               }
@@ -296,13 +296,15 @@ $result_trees{'ref_in_multitable'} = {
                               'text' => 'adsf'
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'footnote',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
                                       'contents' => [
                                         {
-                                          'args' => [
+                                          'cmdname' => 'ref',
+                                          'contents' => [
                                             {
                                               'contents' => [
                                                 {
@@ -325,7 +327,6 @@ $result_trees{'ref_in_multitable'} = {
                                               'type' => 'brace_arg'
                                             }
                                           ],
-                                          'cmdname' => 'ref',
                                           'source_info' => {
                                             'line_nr' => 11
                                           }
@@ -337,7 +338,6 @@ $result_trees{'ref_in_multitable'} = {
                                   'type' => 'brace_command_context'
                                 }
                               ],
-                              'cmdname' => 'footnote',
                               'extra' => {},
                               'source_info' => {
                                 'line_nr' => 11
@@ -443,7 +443,8 @@ $result_trees{'ref_in_multitable'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -466,7 +467,6 @@ $result_trees{'ref_in_multitable'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 16
               }
@@ -484,15 +484,15 @@ $result_trees{'ref_in_multitable'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'columnfractions'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'ref_in_multitable'} = '@novalidate
 
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index 3d543a29dc..ac306e2458 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -64,7 +64,8 @@ $result_trees{'w_in_multitable'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'w',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -78,7 +79,6 @@ $result_trees{'w_in_multitable'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'w',
                               'source_info' => {
                                 'line_nr' => 2
                               }
diff --git a/tp/t/results/paragraph/close_paragraph_command.pl 
b/tp/t/results/paragraph/close_paragraph_command.pl
index 5a7d1790e9..0d5e684534 100644
--- a/tp/t/results/paragraph/close_paragraph_command.pl
+++ b/tp/t/results/paragraph/close_paragraph_command.pl
@@ -18,7 +18,8 @@ $result_trees{'close_paragraph_command'} = {
           'type' => 'paragraph'
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -28,7 +29,6 @@ $result_trees{'close_paragraph_command'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 1
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 35cc821337..30ca4db5b4 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -714,7 +714,8 @@ $result_trees{'commands_in_flushright'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -729,7 +730,6 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
diff --git a/tp/t/results/paragraph/double_style_paragraph.pl 
b/tp/t/results/paragraph/double_style_paragraph.pl
index 1048faa16c..4aec8460b0 100644
--- a/tp/t/results/paragraph/double_style_paragraph.pl
+++ b/tp/t/results/paragraph/double_style_paragraph.pl
@@ -12,11 +12,13 @@ $result_trees{'double_style_paragraph'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -36,7 +38,6 @@ $result_trees{'double_style_paragraph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -45,7 +46,6 @@ $result_trees{'double_style_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/paragraph/image_in_paragraph.pl 
b/tp/t/results/paragraph/image_in_paragraph.pl
index 6a7c81a63d..b33372df1b 100644
--- a/tp/t/results/paragraph/image_in_paragraph.pl
+++ b/tp/t/results/paragraph/image_in_paragraph.pl
@@ -15,7 +15,8 @@ $result_trees{'image_in_paragraph'} = {
               'text' => 'Para. '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'image_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
diff --git a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl 
b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
index 27e1fc7e5b..a051d3b86d 100644
--- a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
+++ b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
@@ -54,7 +54,8 @@ $result_trees{'indent_before_macro_definition_and_other'} = {
           }
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -64,7 +65,6 @@ $result_trees{'indent_before_macro_definition_and_other'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -237,7 +237,8 @@ $result_trees{'indent_before_macro_definition_and_other'} = 
{
           }
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -247,7 +248,6 @@ $result_trees{'indent_before_macro_definition_and_other'} = 
{
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'spot'
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl 
b/tp/t/results/paragraph/no_paragraph_commands.pl
index 6a36bb3ad4..85698a5eb8 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -17,7 +17,8 @@ $result_trees{'no_paragraph_commands'} = {
 '
         },
         {
-          'args' => [
+          'cmdname' => 'titlefont',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -27,7 +28,6 @@ $result_trees{'no_paragraph_commands'} = {
               'type' => 'brace_container'
             }
           ],
-          'cmdname' => 'titlefont',
           'extra' => {},
           'source_info' => {
             'line_nr' => 2
@@ -38,7 +38,8 @@ $result_trees{'no_paragraph_commands'} = {
 '
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -80,7 +81,6 @@ $result_trees{'no_paragraph_commands'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/paragraph/paragraph_command.pl 
b/tp/t/results/paragraph/paragraph_command.pl
index 16290c88dc..18787b4173 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -29,7 +29,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -39,7 +40,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -59,7 +59,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -69,7 +70,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -89,7 +89,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -119,7 +119,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -129,7 +130,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -183,7 +183,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'foo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -196,7 +197,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'foo',
               'extra' => {
                 'begin' => '\\',
                 'end' => '//'
@@ -224,7 +224,8 @@ $result_trees{'paragraph_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -239,7 +240,6 @@ $result_trees{'paragraph_command'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 14
diff --git a/tp/t/results/paragraph/paragraph_in_style_command.pl 
b/tp/t/results/paragraph/paragraph_in_style_command.pl
index 7d9def2d6b..2f73dff123 100644
--- a/tp/t/results/paragraph/paragraph_in_style_command.pl
+++ b/tp/t/results/paragraph/paragraph_in_style_command.pl
@@ -15,7 +15,8 @@ $result_trees{'paragraph_in_style_command'} = {
               'text' => 'a 2 paragraphs sample '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -31,7 +32,6 @@ $result_trees{'paragraph_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -59,7 +59,8 @@ $result_trees{'paragraph_in_style_command'} = {
               'text' => 'a 3 paragraphs sample '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -75,7 +76,6 @@ $result_trees{'paragraph_in_style_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/paragraph/sole_image.pl 
b/tp/t/results/paragraph/sole_image.pl
index d862776f0b..ccfb940a28 100644
--- a/tp/t/results/paragraph/sole_image.pl
+++ b/tp/t/results/paragraph/sole_image.pl
@@ -10,7 +10,8 @@ $result_trees{'sole_image'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'sole_image'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
index e2d3308bda..87957dd24e 100644
--- a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
@@ -43,7 +43,8 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'U',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'U',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/plaintext_tests/accent_command_punctuation.pl 
b/tp/t/results/plaintext_tests/accent_command_punctuation.pl
index af0ec5f257..5662803e72 100644
--- a/tp/t/results/plaintext_tests/accent_command_punctuation.pl
+++ b/tp/t/results/plaintext_tests/accent_command_punctuation.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_command_punctuation'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'accent_command_punctuation'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl 
b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
index 1ad8f61353..0a6b42f12e 100644
--- a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
@@ -48,14 +48,16 @@ $result_trees{'accents_in_var_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'AA'
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +67,6 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -74,7 +75,8 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -84,7 +86,6 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -93,7 +94,8 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -103,7 +105,6 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -112,7 +113,6 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git 
a/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl 
b/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
index 0744a9611b..2383bc3ee2 100644
--- a/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
+++ b/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl
@@ -15,7 +15,8 @@ $result_trees{'after_punctuation_character_in_command'} = {
               'text' => 'Text.'
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -29,7 +30,6 @@ $result_trees{'after_punctuation_character_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl 
b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
index 12e02e90af..0d14e0d177 100644
--- a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
+++ b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
@@ -24,7 +24,8 @@ $result_trees{'anchor_and_empty_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -34,7 +35,6 @@ $result_trees{'anchor_and_empty_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'in-anchor'
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 46999849c5..4ff207522e 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -39,12 +39,12 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'TeX'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TeX',
                   'source_info' => {
                     'line_nr' => 3
                   }
@@ -57,7 +57,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'code'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -67,7 +68,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 4
                   }
@@ -80,7 +80,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'acronym'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'acronym',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -103,7 +104,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'acronym',
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -116,7 +116,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'acronym2'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'acronym',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -126,7 +127,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'acronym',
                   'source_info' => {
                     'line_nr' => 6
                   }
@@ -139,7 +139,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'email'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'email',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -162,7 +163,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'email',
                   'source_info' => {
                     'line_nr' => 7
                   }
@@ -175,7 +175,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'ref'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -193,7 +194,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 8
                   }
@@ -206,7 +206,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'Foornote'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -221,7 +222,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 9
@@ -235,11 +235,13 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'accent'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -249,7 +251,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -258,7 +259,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 10
                   }
@@ -333,7 +333,8 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'text' => 'anchor'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -343,7 +344,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'anchor'
@@ -438,7 +438,7 @@ $result_trees{'at_commands_glued_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'at_commands_glued_in_example'} = '@example
 at@@.
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index 81d1664df1..481851c307 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -25,12 +25,12 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'TeX'
             },
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -43,7 +43,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'code'
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -66,7 +66,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'acronym'
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -89,7 +90,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -102,7 +102,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'acronym2'
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -112,7 +113,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -125,7 +125,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'email'
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -148,7 +149,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -161,7 +161,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'ref'
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -179,7 +180,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -192,7 +192,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'Foornote'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -207,7 +208,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 8
@@ -221,11 +221,13 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'accent'
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -235,7 +237,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 9
                       }
@@ -244,7 +245,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -324,7 +324,8 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'text' => 'anchor'
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -334,7 +335,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'anchor'
@@ -394,7 +394,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'at_commands_glued_in_paragraph'} = 'at@@.
 TeX@TeX{}TeX.
diff --git a/tp/t/results/plaintext_tests/before_accent_punctuation.pl 
b/tp/t/results/plaintext_tests/before_accent_punctuation.pl
index 764eac19b5..77c7b0cb0f 100644
--- a/tp/t/results/plaintext_tests/before_accent_punctuation.pl
+++ b/tp/t/results/plaintext_tests/before_accent_punctuation.pl
@@ -15,7 +15,8 @@ $result_trees{'before_accent_punctuation'} = {
               'text' => 'a. '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'before_accent_punctuation'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl 
b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
index d8812b9385..2bcfe54298 100644
--- a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
+++ b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
@@ -12,7 +12,8 @@ $result_trees{'characters_and_commands_in_var'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'characters_and_commands_in_var'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -50,7 +50,8 @@ $result_trees{'characters_and_commands_in_var'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -60,7 +61,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -69,7 +69,8 @@ $result_trees{'characters_and_commands_in_var'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -99,7 +99,8 @@ $result_trees{'characters_and_commands_in_var'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -122,7 +123,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -142,14 +142,16 @@ $result_trees{'characters_and_commands_in_var'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'AA'
                     },
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -159,7 +161,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -168,7 +169,8 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'u',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -178,7 +180,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'u',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -187,7 +188,8 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '`',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -197,7 +199,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '`',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -206,12 +207,12 @@ $result_trees{'characters_and_commands_in_var'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -220,7 +221,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -243,7 +243,8 @@ $result_trees{'characters_and_commands_in_var'} = {
               'text' => 'AAA'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,8 @@ $result_trees{'characters_and_commands_in_var'} = {
                           'text' => 'ds '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -270,7 +272,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -289,7 +290,6 @@ $result_trees{'characters_and_commands_in_var'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 8
diff --git a/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl 
b/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
index 056654ba41..a5f01f50cf 100644
--- a/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
+++ b/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
@@ -12,7 +12,8 @@ $result_trees{'code_commands_and_punctuation'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'code_commands_and_punctuation'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'code_commands_and_punctuation'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'code_commands_and_punctuation'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl 
b/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
index 171e8582d0..3c5e19229f 100644
--- a/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
+++ b/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
@@ -12,12 +12,12 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'TeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'TeX',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -26,12 +26,12 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'text' => '. And '
             },
             {
-              'args' => [
+              'cmdname' => 'LaTeX',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'LaTeX',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -40,12 +40,12 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -54,12 +54,12 @@ $result_trees{'command_brace_no_arg_punctuation'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/commands_and_punctuation.pl 
b/tp/t/results/plaintext_tests/commands_and_punctuation.pl
index fe3b61f6de..0fab8cebf9 100644
--- a/tp/t/results/plaintext_tests/commands_and_punctuation.pl
+++ b/tp/t/results/plaintext_tests/commands_and_punctuation.pl
@@ -27,12 +27,12 @@ $result_trees{'commands_and_punctuation'} = {
               'text' => ' Now dots '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -41,12 +41,12 @@ $result_trees{'commands_and_punctuation'} = {
               'text' => ' and enddots '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/east_asian_in_w.pl 
b/tp/t/results/plaintext_tests/east_asian_in_w.pl
index 7717d5d8dc..48ed395e40 100644
--- a/tp/t/results/plaintext_tests/east_asian_in_w.pl
+++ b/tp/t/results/plaintext_tests/east_asian_in_w.pl
@@ -61,7 +61,8 @@ $result_trees{'east_asian_in_w'} = {
               'text' => '('
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -71,7 +72,6 @@ $result_trees{'east_asian_in_w'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'file_name' => 'east_asian_in_w.texi',
                 'line_nr' => 4
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index bf35d17d3d..518a339e43 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -240,12 +240,12 @@ $result_trees{'japanese_utf8'} = {
                   'text' => 'Copyright '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'copyright',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'copyright',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
                     'line_nr' => 12
@@ -266,7 +266,8 @@ $result_trees{'japanese_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -284,7 +285,6 @@ $result_trees{'japanese_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
                     'line_nr' => 14
@@ -305,7 +305,8 @@ $result_trees{'japanese_utf8'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'emph',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -319,7 +320,6 @@ $result_trees{'japanese_utf8'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'emph',
                   'source_info' => {
                     'file_name' => 'japanese_utf8.texi',
                     'line_nr' => 18
diff --git a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl 
b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
index 599df1326a..6d96b8c11b 100644
--- a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
+++ b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
@@ -12,7 +12,8 @@ $result_trees{'lone_braces_in_inlineraw'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -43,7 +44,6 @@ $result_trees{'lone_braces_in_inlineraw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl 
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index 95edfa3f90..7e0e62d052 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -42,7 +42,8 @@ $result_trees{'long_uref_after_item'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'uref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -52,7 +53,6 @@ $result_trees{'long_uref_after_item'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'uref',
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/plaintext_tests/multiline_image_and_align.pl 
b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
index eb3cfe82e3..e696974058 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -14,7 +14,8 @@ $result_trees{'multiline_image_and_align'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -24,7 +25,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -65,7 +65,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'CCCC '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -75,7 +76,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -116,7 +116,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'fffffffffffffffffffffffffffffffffffffff '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -126,7 +127,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -167,7 +167,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'dddd '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -177,7 +178,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -234,7 +234,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -244,7 +245,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -270,7 +270,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => 'BBB '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -280,7 +281,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -292,7 +292,8 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' gggg '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -302,7 +303,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -329,7 +329,8 @@ $result_trees{'multiline_image_and_align'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -339,7 +340,6 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
diff --git a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl 
b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
index 6b09fbd1f5..57d14c94e7 100644
--- a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
+++ b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
@@ -15,7 +15,8 @@ $result_trees{'multiline_verb_after_space'} = {
               'text' => 'AA '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -31,7 +32,6 @@ $result_trees{'multiline_verb_after_space'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '*'
               },
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index a27b6bfacc..6b7eb587ab 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -12,14 +12,16 @@ $result_trees{'nested_code_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'aA '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -29,7 +31,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -38,7 +39,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -48,14 +48,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'cc '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -65,7 +67,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -74,7 +75,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -84,14 +84,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in command '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'kbd',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -101,7 +103,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'kbd',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -110,7 +111,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -120,14 +120,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'command',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -137,7 +139,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'command',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -146,7 +147,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -156,14 +156,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in samp '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -173,7 +175,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -182,7 +183,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -192,14 +192,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -209,7 +211,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -218,7 +219,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -228,14 +228,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in var '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -245,7 +247,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -254,7 +255,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -264,14 +264,16 @@ $result_trees{'nested_code_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in code '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'var',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -281,7 +283,6 @@ $result_trees{'nested_code_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'var',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -290,7 +291,6 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -324,7 +324,8 @@ $result_trees{'nested_code_commands'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -334,7 +335,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -344,14 +344,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'aA '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -361,7 +363,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 12
                           }
@@ -370,7 +371,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 12
                   }
@@ -380,7 +380,8 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -390,7 +391,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -400,14 +400,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in command '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -417,7 +419,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 14
                           }
@@ -426,7 +427,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 14
                   }
@@ -436,14 +436,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'command',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -453,7 +455,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'command',
                           'source_info' => {
                             'line_nr' => 15
                           }
@@ -462,7 +463,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 15
                   }
@@ -472,14 +472,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in samp '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -489,7 +491,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 16
                           }
@@ -498,7 +499,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 16
                   }
@@ -508,14 +508,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -525,7 +527,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'samp',
                           'source_info' => {
                             'line_nr' => 17
                           }
@@ -534,7 +535,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 17
                   }
@@ -544,14 +544,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in var '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -561,7 +563,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 18
                           }
@@ -570,7 +571,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 18
                   }
@@ -580,14 +580,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -597,7 +599,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 19
                           }
@@ -606,7 +607,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 19
                   }
@@ -675,7 +675,8 @@ $result_trees{'nested_code_commands'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -685,7 +686,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'source_info' => {
                     'line_nr' => 23
                   }
@@ -695,14 +695,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'aA '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -712,7 +714,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 24
                           }
@@ -721,7 +722,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 24
                   }
@@ -731,14 +731,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'command',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in command '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'kbd',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -748,7 +750,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'kbd',
                           'source_info' => {
                             'line_nr' => 25
                           }
@@ -757,7 +758,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'command',
                   'source_info' => {
                     'line_nr' => 25
                   }
@@ -767,14 +767,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'command',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -784,7 +786,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'command',
                           'source_info' => {
                             'line_nr' => 26
                           }
@@ -793,7 +794,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 26
                   }
@@ -803,14 +803,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in samp '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -820,7 +822,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 27
                           }
@@ -829,7 +830,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 27
                   }
@@ -839,14 +839,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'samp',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -856,7 +858,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'samp',
                           'source_info' => {
                             'line_nr' => 28
                           }
@@ -865,7 +866,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 28
                   }
@@ -875,14 +875,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in var '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'code',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -892,7 +894,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'code',
                           'source_info' => {
                             'line_nr' => 29
                           }
@@ -901,7 +902,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 29
                   }
@@ -911,14 +911,16 @@ $result_trees{'nested_code_commands'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
                           'text' => 'in code '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'var',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -928,7 +930,6 @@ $result_trees{'nested_code_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'var',
                           'source_info' => {
                             'line_nr' => 30
                           }
@@ -937,7 +938,6 @@ $result_trees{'nested_code_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 30
                   }
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 0df2ac4646..bee3374b1e 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
@@ -153,7 +153,8 @@ $result_trees{'no_empty_line_after_section'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'uref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -163,7 +164,6 @@ $result_trees{'no_empty_line_after_section'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'uref',
               'source_info' => {
                 'line_nr' => 11
               }
diff --git a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl 
b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
index 8d39a69202..798fb39e8e 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -20,7 +20,8 @@ $result_trees{'protect_spaces_on_line'} = {
               'text' => 'Before samp. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'protect_spaces_on_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -39,7 +39,8 @@ $result_trees{'protect_spaces_on_line'} = {
               'text' => '. after samp, w '
             },
             {
-              'args' => [
+              'cmdname' => 'w',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -49,7 +50,6 @@ $result_trees{'protect_spaces_on_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'w',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -88,7 +88,8 @@ $result_trees{'protect_spaces_on_line'} = {
                       'text' => 'before samp. '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'samp',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -98,7 +99,6 @@ $result_trees{'protect_spaces_on_line'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'samp',
                       'source_info' => {
                         'line_nr' => 5
                       }
@@ -107,7 +107,8 @@ $result_trees{'protect_spaces_on_line'} = {
                       'text' => '. after samp, w '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'w',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -117,7 +118,6 @@ $result_trees{'protect_spaces_on_line'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'w',
                       'source_info' => {
                         'line_nr' => 5
                       }
diff --git a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl 
b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
index c8a2ff944a..470abc784f 100644
--- a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
+++ b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
@@ -12,7 +12,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,7 +31,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -50,7 +50,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -60,7 +61,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -69,7 +69,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -89,7 +89,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -112,7 +113,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -121,7 +121,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -144,7 +145,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -153,7 +153,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'abbr',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -176,7 +177,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'abbr',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -186,7 +186,8 @@ $result_trees{'punctuation_abbr_acronym'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -209,7 +210,6 @@ $result_trees{'punctuation_abbr_acronym'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
index dbc24f6988..e086475884 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
@@ -12,7 +12,8 @@ $result_trees{'punctuation_and_code_style_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -22,7 +23,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -31,11 +31,13 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -45,7 +47,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -54,7 +55,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -63,16 +63,17 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -81,7 +82,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -91,7 +91,8 @@ $result_trees{'punctuation_and_code_style_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -101,7 +102,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -110,11 +110,13 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -124,7 +126,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -133,7 +134,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -142,16 +142,17 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -160,7 +161,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -170,7 +170,8 @@ $result_trees{'punctuation_and_code_style_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -180,7 +181,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -189,14 +189,16 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -206,7 +208,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -215,7 +216,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -224,19 +224,20 @@ $result_trees{'punctuation_and_code_style_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -245,7 +246,6 @@ $result_trees{'punctuation_and_code_style_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
index a31e12c1fa..7a893a34bd 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
@@ -43,7 +43,8 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -62,11 +62,13 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -76,7 +78,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -85,7 +86,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -94,16 +94,17 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -112,7 +113,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -122,7 +122,8 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -141,11 +141,13 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -155,7 +157,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -164,7 +165,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -173,16 +173,17 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -191,7 +192,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -201,7 +201,8 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'command',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -211,7 +212,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'command',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -220,14 +220,16 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} 
= {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -237,7 +239,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -246,7 +247,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -255,19 +255,20 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -276,7 +277,6 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
index 04e111cf4e..58b0d43c6d 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
@@ -20,7 +20,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => 'Text.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -35,7 +36,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 2
@@ -49,7 +49,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => 'end.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -64,7 +65,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 3
@@ -74,7 +74,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => '  S2.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -89,7 +90,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 3
@@ -113,7 +113,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => 'No PERIOD.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -128,7 +129,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -138,7 +138,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => ' worD.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -153,7 +154,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 5
@@ -167,7 +167,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'text' => 'wW.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -182,7 +183,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 6
@@ -209,7 +209,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -224,7 +225,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 8
@@ -241,7 +241,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -256,7 +257,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -273,7 +273,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 10
@@ -315,7 +315,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -330,7 +331,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 12
@@ -347,7 +347,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 13
@@ -379,7 +379,8 @@ $result_trees{'punctuation_and_footnotes'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -394,7 +395,6 @@ $result_trees{'punctuation_and_footnotes'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 14
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
index 547556554d..08c479e9c1 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
@@ -52,7 +52,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => 'Text.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -67,7 +68,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 3
@@ -81,7 +81,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => 'end.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -96,7 +97,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -106,7 +106,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => '  S2.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -121,7 +122,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 4
@@ -145,7 +145,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => 'No PERIOD.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -160,7 +161,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 6
@@ -170,7 +170,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => ' worD.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -185,7 +186,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 6
@@ -199,7 +199,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'text' => 'wW.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -214,7 +215,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 7
@@ -241,7 +241,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -256,7 +257,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 9
@@ -273,7 +273,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 10
@@ -305,7 +305,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => '.'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -320,7 +321,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 11
@@ -347,7 +347,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 13
@@ -379,7 +379,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -394,7 +395,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 14
@@ -411,7 +411,8 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
               'cmdname' => ':'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -426,7 +427,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 15
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
index 8c8c422675..f5cd0f2f73 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
@@ -17,7 +17,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -27,7 +28,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -36,11 +36,13 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -50,7 +52,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -59,7 +60,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -68,16 +68,17 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -86,7 +87,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -96,7 +96,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -106,7 +107,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -115,11 +115,13 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -129,7 +131,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -138,7 +139,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -147,16 +147,17 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -165,7 +166,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -175,7 +175,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -185,7 +186,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -194,14 +194,16 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -211,7 +213,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -220,7 +221,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -229,19 +229,20 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -250,7 +251,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -270,7 +270,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -289,11 +289,13 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -303,7 +305,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -312,7 +313,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -321,16 +321,17 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -339,7 +340,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -349,7 +349,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -359,7 +360,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -368,11 +368,13 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -382,7 +384,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -391,7 +392,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -400,16 +400,17 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -418,7 +419,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -428,7 +428,8 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -438,7 +439,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -447,14 +447,16 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -464,7 +466,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -473,7 +474,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -482,19 +482,20 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -503,7 +504,6 @@ $result_trees{'punctuation_and_upper_case_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
index 6f5b8b0bd0..1942f056ad 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
@@ -43,7 +43,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -62,11 +62,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -76,7 +78,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -85,7 +86,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -94,16 +94,17 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -112,7 +113,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -122,7 +122,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -132,7 +133,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -141,11 +141,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -155,7 +157,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -164,7 +165,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -173,16 +173,17 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -191,7 +192,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -201,7 +201,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -211,7 +212,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -220,14 +220,16 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -237,7 +239,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -246,7 +247,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -255,19 +255,20 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'var',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -276,7 +277,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'var',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -296,7 +296,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -306,7 +307,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -315,11 +315,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -329,7 +331,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -338,7 +339,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -347,16 +347,17 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -365,7 +366,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -375,7 +375,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -385,7 +386,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -394,11 +394,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -408,7 +410,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -417,7 +418,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -426,16 +426,17 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -444,7 +445,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -454,7 +454,8 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -473,14 +473,16 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '.  '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -490,7 +492,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -499,7 +500,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -508,19 +508,20 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'double '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -529,7 +530,6 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl 
b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
index 3797edbf23..e1ae52c005 100644
--- a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
@@ -20,7 +20,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => 'Text. Email '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -38,7 +39,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -47,7 +47,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' dmn '
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -66,7 +66,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' and text. indicateurl '
             },
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -76,7 +77,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -89,7 +89,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => 'then kbd '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -99,7 +100,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -108,7 +108,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' and math '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -118,7 +119,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -127,7 +127,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' and cite '
             },
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -137,7 +138,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -146,7 +146,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' and emph '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -156,7 +157,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -169,11 +169,13 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => 'asis in code '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -183,7 +185,6 @@ $result_trees{'punctuation_at_end_command'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -192,7 +193,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -201,7 +201,8 @@ $result_trees{'punctuation_at_end_command'} = {
               'text' => ' text. a dot before a emph open .'
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -211,7 +212,6 @@ $result_trees{'punctuation_at_end_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_commands.pl 
b/tp/t/results/plaintext_tests/punctuation_commands.pl
index fd11b56d31..3666c32667 100644
--- a/tp/t/results/plaintext_tests/punctuation_commands.pl
+++ b/tp/t/results/plaintext_tests/punctuation_commands.pl
@@ -70,12 +70,12 @@ $result_trees{'punctuation_commands'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -84,12 +84,12 @@ $result_trees{'punctuation_commands'} = {
               'text' => ' Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -142,12 +142,12 @@ $result_trees{'punctuation_commands'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -208,12 +208,12 @@ $result_trees{'punctuation_commands'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 16
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
index b38afa912b..c5e87cad65 100644
--- a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
@@ -102,12 +102,12 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -116,12 +116,12 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'text' => ' Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -174,12 +174,12 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -240,12 +240,12 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
               'text' => 'Enddots'
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'line_nr' => 17
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command.pl 
b/tp/t/results/plaintext_tests/punctuation_in_command.pl
index a7f00da723..e1ea23bef5 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command.pl
@@ -20,7 +20,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => 'Text. Email '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -38,7 +39,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -47,7 +47,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' dmn '
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -66,7 +66,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' and text. indicateurl '
             },
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -76,7 +77,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -85,7 +85,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' and then kbd '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -95,7 +96,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -104,7 +104,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' and math '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -114,7 +115,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -123,7 +123,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' and cite '
             },
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -133,7 +134,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -142,7 +142,8 @@ $result_trees{'punctuation_in_command'} = {
               'text' => ' and emph '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -152,7 +153,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -165,11 +165,13 @@ $result_trees{'punctuation_in_command'} = {
               'text' => 'asis in code '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -179,7 +181,6 @@ $result_trees{'punctuation_in_command'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -188,7 +189,6 @@ $result_trees{'punctuation_in_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl 
b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
index e66634be10..b1084ef103 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
@@ -15,7 +15,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'Text. Email '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -33,7 +34,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -46,7 +46,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'dmn '
             },
             {
-              'args' => [
+              'cmdname' => 'dmn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -56,7 +57,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dmn',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -69,7 +69,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'and text. indicateurl '
             },
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -92,7 +92,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'and then kbd '
             },
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -102,7 +103,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -115,7 +115,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'and math '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -125,7 +126,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -138,7 +138,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'and cite '
             },
             {
-              'args' => [
+              'cmdname' => 'cite',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -148,7 +149,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'cite',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -161,7 +161,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'and emph '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -171,7 +172,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -184,11 +184,13 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'text. asis in code '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -198,7 +200,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -207,7 +208,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 8
               }
@@ -220,7 +220,8 @@ $result_trees{'punctuation_in_command_end_line'} = {
               'text' => 'text. a dot before a emph open .'
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -234,7 +235,6 @@ $result_trees{'punctuation_in_command_end_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/plaintext_tests/punctuation_in_sc.pl 
b/tp/t/results/plaintext_tests/punctuation_in_sc.pl
index 48c4faabe9..0776b7e11b 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_sc.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_sc.pl
@@ -15,7 +15,8 @@ $result_trees{'punctuation_in_sc'} = {
               'text' => 'one '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,7 +26,6 @@ $result_trees{'punctuation_in_sc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -34,7 +34,8 @@ $result_trees{'punctuation_in_sc'} = {
               'text' => ' three '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -44,7 +45,6 @@ $result_trees{'punctuation_in_sc'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 1
               }
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 1cd6309db5..e0b2c80e5e 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
@@ -171,7 +171,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
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 ea6d9759ca..eb35182c5f 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 8288e1d445..d8ad19361a 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 fd96868879..61480cd3d7 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -171,7 +171,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'punctuation_sc_accents_default'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'punctuation_sc_accents_default'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
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 03e5d00286..7489f7f4b8 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ $result_trees{'punctuation_sc_accents_default_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ $result_trees{'punctuation_sc_accents_default_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 3a9489d5ae..67dc7f4630 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ $result_trees{'punctuation_sc_accents_default_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ $result_trees{'punctuation_sc_accents_default_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 c9d8b5d892..99adc2edf4 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
@@ -171,7 +171,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -181,7 +182,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -191,7 +191,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -211,7 +211,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -221,7 +222,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -231,7 +231,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -241,7 +242,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -251,12 +251,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -266,12 +266,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -281,12 +281,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 11
@@ -307,12 +307,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -322,12 +322,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -337,12 +337,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -352,7 +352,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -362,7 +363,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -372,7 +372,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -382,7 +383,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -392,12 +392,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -407,12 +407,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -422,12 +422,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 13
@@ -438,12 +438,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -453,12 +453,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -468,12 +468,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 14
@@ -484,12 +484,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -499,12 +499,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 15
@@ -530,7 +530,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -540,7 +541,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 18
@@ -551,7 +551,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -561,7 +562,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 19
@@ -572,12 +572,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -587,12 +587,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -602,7 +602,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -612,7 +613,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -622,7 +622,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -632,7 +633,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -642,11 +642,13 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -656,7 +658,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -666,7 +667,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -676,7 +676,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -686,7 +687,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -696,7 +696,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -706,7 +707,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -716,11 +716,13 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -730,7 +732,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -740,7 +741,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -750,15 +750,18 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -768,7 +771,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 20
@@ -778,7 +780,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 20
@@ -788,7 +789,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 20
@@ -799,12 +799,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 21
@@ -815,16 +815,17 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -834,12 +835,12 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -849,7 +850,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -859,7 +861,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -869,7 +870,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -879,7 +881,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -889,11 +890,13 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -903,7 +906,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -913,7 +915,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -923,7 +924,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -933,7 +935,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -943,7 +944,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -953,7 +955,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -963,11 +964,13 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -977,7 +980,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -987,7 +989,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -997,15 +998,18 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1015,7 +1019,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                         'line_nr' => 22
@@ -1025,7 +1028,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                                 'line_nr' => 22
@@ -1035,7 +1037,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_utf8.texi',
                         'line_nr' => 22
@@ -1045,7 +1046,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_utf8.texi',
                 'line_nr' => 22
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 4461a867a0..c68e4a3eff 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
@@ -210,7 +210,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 a336457320..d76b471f5a 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
@@ -210,7 +210,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 39c57f31fb..0c524f13a0 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
@@ -210,7 +210,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 e2bfe779fd..9906b87eb1 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
@@ -210,7 +210,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
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 6191496eba..fca4b602ed 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -290,12 +290,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => " a\x{e9}. "
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -305,12 +305,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -320,12 +320,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 13
@@ -346,12 +346,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -361,12 +361,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -376,12 +376,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -391,7 +391,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -401,7 +402,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -431,12 +431,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -446,12 +446,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -461,12 +461,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 15
@@ -477,12 +477,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -492,12 +492,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -507,12 +507,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 16
@@ -523,12 +523,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -538,12 +538,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 17
@@ -569,7 +569,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -579,7 +580,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 20
@@ -590,7 +590,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -600,7 +601,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 21
@@ -611,12 +611,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -626,12 +626,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -641,7 +641,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -651,7 +652,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -681,11 +681,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -695,7 +697,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -705,7 +706,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -715,7 +715,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -755,11 +755,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -769,7 +771,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -779,7 +780,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -789,15 +789,18 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -807,7 +810,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 22
@@ -817,7 +819,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 22
@@ -827,7 +828,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 22
@@ -838,12 +838,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 23
@@ -854,16 +854,17 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -873,12 +874,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -888,7 +889,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -898,7 +900,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -928,11 +929,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -942,7 +945,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -952,7 +954,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -962,7 +963,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1002,11 +1003,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1016,7 +1019,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1026,7 +1028,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1036,15 +1037,18 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1054,7 +1058,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                         'line_nr' => 24
@@ -1064,7 +1067,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                                 'line_nr' => 24
@@ -1074,7 +1076,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_latin1.texi',
                         'line_nr' => 24
@@ -1084,7 +1085,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 24
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 ff5336e344..129ced0b2a 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
@@ -210,7 +210,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -220,7 +221,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -230,7 +230,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ', --- '
             },
             {
-              'args' => [
+              'cmdname' => 'dfn',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -240,7 +241,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dfn',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -250,7 +250,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' -- '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -260,7 +261,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -270,7 +270,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -290,7 +290,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' a'
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -300,7 +301,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -310,12 +310,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -325,12 +325,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -340,12 +340,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'dots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 13
@@ -366,12 +366,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'geq',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'geq',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -381,12 +381,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'enddots',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'enddots',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -396,12 +396,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -411,7 +411,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '\'',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -421,7 +422,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '\'',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -431,7 +431,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -441,7 +442,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -451,12 +451,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -466,12 +466,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'copyright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'copyright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -481,12 +481,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'error',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'error',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 15
@@ -497,12 +497,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblleft',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblleft',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -512,12 +512,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' in quotes '
             },
             {
-              'args' => [
+              'cmdname' => 'quotedblright',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'quotedblright',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -527,12 +527,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'expansion',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'expansion',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 16
@@ -543,12 +543,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'minus',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'minus',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -558,12 +558,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'registeredsymbol',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'registeredsymbol',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 17
@@ -589,7 +589,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'u',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -599,7 +600,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'u',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 20
@@ -610,7 +610,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -620,7 +621,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 21
@@ -631,12 +631,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'aa',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'aa',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -646,12 +646,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'AA',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'AA',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -661,7 +661,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -671,7 +672,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -681,7 +681,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -691,7 +692,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -701,11 +701,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -715,7 +717,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -725,7 +726,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -735,7 +735,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'dotless',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -745,7 +746,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'dotless',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -755,7 +755,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'udotaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -765,7 +766,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'udotaccent',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -775,11 +775,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'v',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -789,7 +791,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -799,7 +800,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'v',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -809,15 +809,18 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '=',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => ',',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '~',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -827,7 +830,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '~',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 22
@@ -837,7 +839,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => ',',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 22
@@ -847,7 +848,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '=',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 22
@@ -858,12 +858,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'equiv',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'equiv',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 23
@@ -874,16 +874,17 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
 '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'aa',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'aa',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -893,12 +894,12 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'AA',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'AA',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -908,7 +909,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -918,7 +920,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -928,7 +929,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'text' => " \x{e9} "
                     },
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -938,7 +940,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -948,11 +949,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'dotless',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -962,7 +965,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'dotless',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -972,7 +974,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -982,7 +983,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -992,7 +994,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1002,7 +1003,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'udotaccent',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1012,7 +1014,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'udotaccent',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1022,11 +1023,13 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'v',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => '\'',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -1036,7 +1039,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => '\'',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1046,7 +1048,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'v',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1056,15 +1057,18 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} 
= {
                       'text' => ' '
                     },
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => ',',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
+                                      'cmdname' => '~',
+                                      'contents' => [
                                         {
                                           'contents' => [
                                             {
@@ -1074,7 +1078,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                                           'type' => 'brace_container'
                                         }
                                       ],
-                                      'cmdname' => '~',
                                       'source_info' => {
                                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                         'line_nr' => 24
@@ -1084,7 +1087,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => ',',
                               'source_info' => {
                                 'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                                 'line_nr' => 24
@@ -1094,7 +1096,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'file_name' => 
'punctuation_small_case_accents_us_ascii.texi',
                         'line_nr' => 24
@@ -1104,7 +1105,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 24
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 0fe1d7a4f0..d8786e9cd4 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -69,7 +69,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -100,7 +101,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 4
@@ -111,7 +111,8 @@ $result_trees{'quote_node_names'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 5
@@ -163,7 +163,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -194,7 +195,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 7
@@ -205,7 +205,8 @@ $result_trees{'quote_node_names'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -236,7 +237,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 8
@@ -257,7 +257,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -288,7 +289,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 10
@@ -299,7 +299,8 @@ $result_trees{'quote_node_names'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -330,7 +331,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 11
@@ -351,7 +351,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -369,7 +370,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 13
@@ -390,11 +390,13 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -404,7 +406,6 @@ $result_trees{'quote_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 15
@@ -422,7 +423,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 15
@@ -446,7 +446,8 @@ $result_trees{'quote_node_names'} = {
               'text' => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -464,7 +465,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 17
@@ -485,7 +485,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -524,7 +525,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 19
@@ -545,7 +545,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -584,7 +585,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 21
@@ -605,7 +605,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -659,7 +660,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 23
@@ -680,7 +680,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -734,7 +735,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 25
@@ -755,7 +755,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -814,7 +815,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 27
@@ -835,7 +835,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -894,7 +895,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 29
@@ -915,7 +915,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -974,7 +975,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 31
@@ -1018,7 +1018,8 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'blah'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1028,7 +1029,6 @@ $result_trees{'quote_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 34
@@ -1099,7 +1099,8 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'blumpty'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1109,7 +1110,6 @@ $result_trees{'quote_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 35
@@ -1215,7 +1215,8 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'funny'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1225,7 +1226,6 @@ $result_trees{'quote_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 37
@@ -1244,7 +1244,8 @@ $result_trees{'quote_node_names'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1254,7 +1255,6 @@ $result_trees{'quote_node_names'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'file_name' => 'nodequote.texi',
                         'line_nr' => 37
@@ -1583,12 +1583,12 @@ $result_trees{'quote_node_names'} = {
               'text' => 'man'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 50
@@ -1641,12 +1641,12 @@ $result_trees{'quote_node_names'} = {
               'text' => 'direct'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 50
@@ -1776,7 +1776,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1786,7 +1787,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 53
@@ -1822,7 +1822,8 @@ $result_trees{'quote_node_names'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1832,7 +1833,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 54
@@ -1920,22 +1920,22 @@ $result_trees{'quote_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
index 5b4c17c0ef..85dec2f451 100644
--- a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
@@ -43,7 +43,8 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git 
a/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl 
b/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
index d2d2bedc7e..ac60821d87 100644
--- a/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
+++ b/tp/t/results/plaintext_tests/split_punctuation_detection_in_commands.pl
@@ -15,7 +15,8 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'text' => 'Before '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -25,13 +26,13 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,13 +42,13 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -57,7 +58,6 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -66,7 +66,8 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
               'text' => ']]? Afte'
             },
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -76,13 +77,13 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 1
               }
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -92,7 +93,6 @@ $result_trees{'split_punctuation_detection_in_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl 
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index 3e636cfe9f..9deaf71ac5 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -246,12 +246,12 @@ $result_trees{'star_at_command_formatting'} = {
               'text' => 'Followed by empty asis and a space '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 16,
                 'macro' => 'mymacro'
@@ -265,7 +265,8 @@ $result_trees{'star_at_command_formatting'} = {
               'text' => 'Followed by asis with space and a space '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -275,7 +276,6 @@ $result_trees{'star_at_command_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 16,
                 'macro' => 'mymacro'
@@ -298,12 +298,12 @@ $result_trees{'star_at_command_formatting'} = {
               'cmdname' => '*'
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 16,
                 'macro' => 'mymacro'
@@ -329,7 +329,8 @@ $result_trees{'star_at_command_formatting'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -339,7 +340,6 @@ $result_trees{'star_at_command_formatting'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 16,
                 'macro' => 'mymacro'
@@ -506,12 +506,12 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => 'Followed by empty asis and a space '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'mymacro'
@@ -525,7 +525,8 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => 'Followed by asis with space and a space '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -535,7 +536,6 @@ $result_trees{'star_at_command_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'mymacro'
@@ -558,12 +558,12 @@ $result_trees{'star_at_command_formatting'} = {
                   'cmdname' => '*'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'mymacro'
@@ -589,7 +589,8 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -599,7 +600,6 @@ $result_trees{'star_at_command_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 20,
                     'macro' => 'mymacro'
@@ -806,12 +806,12 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => 'Followed by empty asis and a space '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 25,
                     'macro' => 'mymacro'
@@ -825,7 +825,8 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => 'Followed by asis with space and a space '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -835,7 +836,6 @@ $result_trees{'star_at_command_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 25,
                     'macro' => 'mymacro'
@@ -858,12 +858,12 @@ $result_trees{'star_at_command_formatting'} = {
                   'cmdname' => '*'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 25,
                     'macro' => 'mymacro'
@@ -889,7 +889,8 @@ $result_trees{'star_at_command_formatting'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -899,7 +900,6 @@ $result_trees{'star_at_command_formatting'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 25,
                     'macro' => 'mymacro'
diff --git a/tp/t/results/plaintext_tests/transparent_text.pl 
b/tp/t/results/plaintext_tests/transparent_text.pl
index 24e9634de3..1206f85f62 100644
--- a/tp/t/results/plaintext_tests/transparent_text.pl
+++ b/tp/t/results/plaintext_tests/transparent_text.pl
@@ -15,7 +15,8 @@ $result_trees{'transparent_text'} = {
               'text' => 'AA'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'transparent_text'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 1
@@ -40,7 +40,8 @@ $result_trees{'transparent_text'} = {
               'text' => '). B ('
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,6 @@ $result_trees{'transparent_text'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index eea3c298a7..b1b42974c3 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -62,7 +62,8 @@ $result_trees{'caption_in_example'} = {
                   'type' => 'preformatted'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'caption',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -77,7 +78,6 @@ $result_trees{'caption_in_example'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'caption',
                   'extra' => {
                     'float' => {}
                   },
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index e19f80f537..9a56433d71 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -29,7 +29,8 @@ $result_trees{'empty_line_style_command'} = {
                   'text' => 'example '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -48,7 +49,6 @@ $result_trees{'empty_line_style_command'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/preformatted/example_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_at_commands_arguments.pl
index e64eeef3c1..90ee16e678 100644
--- a/tp/t/results/preformatted/example_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_at_commands_arguments.pl
@@ -17,7 +17,8 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => 'some  thing '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -27,7 +28,6 @@ $result_trees{'example_at_commands_arguments'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -36,12 +36,12 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'TeX',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -50,12 +50,12 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'exclamdown',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -64,7 +64,8 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -74,7 +75,6 @@ $result_trees{'example_at_commands_arguments'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -83,12 +83,12 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'enddots',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'enddots',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -100,12 +100,12 @@ $result_trees{'example_at_commands_arguments'} = {
                   'cmdname' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'comma',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'comma',
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
index 8e0cba6b80..a4399cd581 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -14,7 +14,8 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ref',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -55,7 +56,6 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'ref',
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -69,7 +69,8 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -79,7 +80,6 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'an-anchor'
@@ -189,7 +189,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'example_invalid_at_commands_arguments'} = '@example 
@ref{a,b,c,d} fa, @anchor{an anchor} on example line, @center in center
 @end example
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 846df15fe2..371ca93ae6 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -24,7 +24,8 @@ $result_trees{'titlefont_in_example'} = {
           'cmdname' => 'example',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'titlefont',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -34,7 +35,6 @@ $result_trees{'titlefont_in_example'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'titlefont',
               'extra' => {},
               'source_info' => {
                 'line_nr' => 2
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 460f1553bd..a42b466565 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -132,12 +132,12 @@ $result_trees{'empty_quotation'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 7
                   }
diff --git a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl 
b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
index 9dc8cbe266..567811c1e6 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -34,7 +34,8 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                   'text' => 'A'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'footnote',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -49,7 +50,6 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                       'type' => 'brace_command_context'
                     }
                   ],
-                  'cmdname' => 'footnote',
                   'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
diff --git a/tp/t/results/raw/empty_line_in_command_in_expanded_not_expanded.pl 
b/tp/t/results/raw/empty_line_in_command_in_expanded_not_expanded.pl
index 1a01fa178a..88cc09661f 100644
--- a/tp/t/results/raw/empty_line_in_command_in_expanded_not_expanded.pl
+++ b/tp/t/results/raw/empty_line_in_command_in_expanded_not_expanded.pl
@@ -125,7 +125,8 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -144,7 +145,6 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'ha-hb'
@@ -163,7 +163,8 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -182,7 +183,6 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 17
                   }
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index 2b4521db18..2a7692a4b9 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -29,7 +29,8 @@ $result_trees{'inline_in_example'} = {
                   'text' => 'A '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'inlineraw',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -53,12 +54,12 @@ $result_trees{'inline_in_example'} = {
                           'text' => '`` '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'lbracechar',
+                          'contents' => [
                             {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'lbracechar',
                           'source_info' => {
                             'line_nr' => 4
                           }
@@ -75,7 +76,6 @@ $result_trees{'inline_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'inlineraw',
                   'extra' => {
                     'expand_index' => 1,
                     'format' => 'plaintext'
@@ -89,7 +89,8 @@ $result_trees{'inline_in_example'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'inlinefmt',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -112,7 +113,6 @@ $result_trees{'inline_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'inlinefmt',
                   'extra' => {
                     'expand_index' => 1,
                     'format' => 'plaintext'
@@ -135,7 +135,8 @@ $result_trees{'inline_in_example'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'inlineraw',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -155,7 +156,8 @@ $result_trees{'inline_in_example'} = {
                           'text' => 'in <i>'
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'acronym',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -165,7 +167,6 @@ $result_trees{'inline_in_example'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'acronym',
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -183,7 +184,6 @@ $result_trees{'inline_in_example'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'inlineraw',
                   'extra' => {
                     'expand_index' => 1,
                     'format' => 'html'
diff --git a/tp/t/results/raw/inline_missing_first_arg.pl 
b/tp/t/results/raw/inline_missing_first_arg.pl
index 862323b50e..258a92cf6b 100644
--- a/tp/t/results/raw/inline_missing_first_arg.pl
+++ b/tp/t/results/raw/inline_missing_first_arg.pl
@@ -12,7 +12,8 @@ $result_trees{'inline_missing_first_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -31,7 +32,6 @@ $result_trees{'inline_missing_first_arg'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => undef
               },
@@ -43,7 +43,8 @@ $result_trees{'inline_missing_first_arg'} = {
               'text' => '. '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'type' => 'brace_arg'
                 },
@@ -57,7 +58,6 @@ $result_trees{'inline_missing_first_arg'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => undef
               },
diff --git a/tp/t/results/raw/inlinefmt.pl b/tp/t/results/raw/inlinefmt.pl
index 015d1340ad..08063e8664 100644
--- a/tp/t/results/raw/inlinefmt.pl
+++ b/tp/t/results/raw/inlinefmt.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinefmt'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,12 +31,12 @@ $result_trees{'inlinefmt'} = {
                       'text' => 'plaintext `` '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -52,7 +53,6 @@ $result_trees{'inlinefmt'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -66,7 +66,8 @@ $result_trees{'inlinefmt'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -81,7 +82,8 @@ $result_trees{'inlinefmt'} = {
                       'text' => 'in <i>'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -91,7 +93,6 @@ $result_trees{'inlinefmt'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -108,7 +109,6 @@ $result_trees{'inlinefmt'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/raw/inlinefmt_with_empty_line.pl 
b/tp/t/results/raw/inlinefmt_with_empty_line.pl
index e2cf69aa79..58fa35f3ec 100644
--- a/tp/t/results/raw/inlinefmt_with_empty_line.pl
+++ b/tp/t/results/raw/inlinefmt_with_empty_line.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -44,7 +45,6 @@ $result_trees{'inlinefmt_with_empty_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -59,12 +59,12 @@ $result_trees{'inlinefmt_with_empty_line'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'lbracechar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'lbracechar',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -74,7 +74,8 @@ $result_trees{'inlinefmt_with_empty_line'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -103,7 +104,6 @@ $result_trees{'inlinefmt_with_empty_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -121,7 +121,8 @@ $result_trees{'inlinefmt_with_empty_line'} = {
               'text' => '<i>'
             },
             {
-              'args' => [
+              'cmdname' => 'acronym',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +132,6 @@ $result_trees{'inlinefmt_with_empty_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'acronym',
               'source_info' => {
                 'line_nr' => 6
               }
diff --git a/tp/t/results/raw/inlineraw.pl b/tp/t/results/raw/inlineraw.pl
index 88e05987b9..77db8ed88d 100644
--- a/tp/t/results/raw/inlineraw.pl
+++ b/tp/t/results/raw/inlineraw.pl
@@ -15,7 +15,8 @@ $result_trees{'inlineraw'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,12 +31,12 @@ $result_trees{'inlineraw'} = {
                       'text' => 'plaintext `` '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -52,7 +53,6 @@ $result_trees{'inlineraw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -66,7 +66,8 @@ $result_trees{'inlineraw'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -81,7 +82,8 @@ $result_trees{'inlineraw'} = {
                       'text' => 'in <i>'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -91,7 +93,6 @@ $result_trees{'inlineraw'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -108,7 +109,6 @@ $result_trees{'inlineraw'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/raw/inlineraw_not_closed.pl 
b/tp/t/results/raw/inlineraw_not_closed.pl
index 0562c09633..9c0e0fc330 100644
--- a/tp/t/results/raw/inlineraw_not_closed.pl
+++ b/tp/t/results/raw/inlineraw_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineraw_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,7 +37,6 @@ $result_trees{'inlineraw_not_closed'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/raw/inlineraw_with_empty_line.pl 
b/tp/t/results/raw/inlineraw_with_empty_line.pl
index e8110123ae..dc3ba94612 100644
--- a/tp/t/results/raw/inlineraw_with_empty_line.pl
+++ b/tp/t/results/raw/inlineraw_with_empty_line.pl
@@ -15,7 +15,8 @@ $result_trees{'inlineraw_with_empty_line'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -36,12 +37,12 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'lbracechar',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'lbracechar',
                       'source_info' => {
                         'line_nr' => 3
                       }
@@ -58,7 +59,6 @@ $result_trees{'inlineraw_with_empty_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'plaintext'
@@ -72,7 +72,8 @@ $result_trees{'inlineraw_with_empty_line'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -96,7 +97,8 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'text' => '<i>'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'acronym',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -106,7 +108,6 @@ $result_trees{'inlineraw_with_empty_line'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'acronym',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -123,7 +124,6 @@ $result_trees{'inlineraw_with_empty_line'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index 87096da2db..533a13f576 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -12,7 +12,8 @@ $result_trees{'raw_expanded_in_style'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -81,7 +82,6 @@ $result_trees{'raw_expanded_in_style'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index 5d8d2bca1c..da651ebf46 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -12,7 +12,8 @@ $result_trees{'raw_in_style'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -81,7 +82,6 @@ $result_trees{'raw_in_style'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/raw/second_level_lone_braces_in_html.pl 
b/tp/t/results/raw/second_level_lone_braces_in_html.pl
index 90b52f986d..4be861f573 100644
--- a/tp/t/results/raw/second_level_lone_braces_in_html.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html.pl
@@ -29,7 +29,8 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'text' => '{a'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -51,7 +52,6 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 2
                   }
@@ -123,7 +123,8 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'text' => '{b'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -149,7 +150,6 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 7
                   }
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl 
b/tp/t/results/raw/verbatim_in_brace_command.pl
index 0bf20b8204..0f2b6fc1a5 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -12,7 +12,8 @@ $result_trees{'verbatim_in_brace_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'verbatim_in_brace_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 5cde3e0e09..130405f38f 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -47,7 +47,8 @@ $result_trees{'anchor_in_copying'} = {
 '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'anchor',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -60,7 +61,6 @@ $result_trees{'anchor_in_copying'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'anchor',
                       'extra' => {
                         'is_target' => 1,
                         'normalized' => 'Copying-information'
@@ -231,7 +231,8 @@ $result_trees{'anchor_in_copying'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -249,7 +250,6 @@ $result_trees{'anchor_in_copying'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 17
               }
@@ -283,7 +283,7 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 ffb7f89b35..b7c7cea5c0 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -36,7 +36,8 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                       'text' => 'Copying'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'footnote',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -46,7 +47,8 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
 '
                                 },
                                 {
-                                  'args' => [
+                                  'cmdname' => 'anchor',
+                                  'contents' => [
                                     {
                                       'contents' => [
                                         {
@@ -59,7 +61,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                                       'type' => 'brace_arg'
                                     }
                                   ],
-                                  'cmdname' => 'anchor',
                                   'extra' => {
                                     'is_target' => 1,
                                     'normalized' => 'Copying-footnote'
@@ -80,7 +81,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                           'type' => 'brace_command_context'
                         }
                       ],
-                      'cmdname' => 'footnote',
                       'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
@@ -253,7 +253,8 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -271,7 +272,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -305,7 +305,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'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_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 2ecf3beafa..0f5e087243 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -31,7 +31,8 @@ $result_trees{'anchor_in_titlepage'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -44,7 +45,6 @@ $result_trees{'anchor_in_titlepage'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-titlepage'
@@ -227,7 +227,8 @@ $result_trees{'anchor_in_titlepage'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -245,7 +246,6 @@ $result_trees{'anchor_in_titlepage'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -274,7 +274,7 @@ $result_trees{'anchor_in_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 002de1f901..63f148f285 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -31,7 +31,8 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'anchor',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -44,7 +45,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'anchor',
                   'extra' => {
                     'is_target' => 1,
                     'normalized' => 'in-titlepage'
@@ -227,7 +227,8 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -245,7 +246,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 12
               }
@@ -274,7 +274,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'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_texis{'anchor_in_titlepage_titlepage'} = '@titlepage
 
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 4d919d3cbd..84a5b1d86d 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -28,7 +28,8 @@ $result_trees{'ref_in_copying'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -46,7 +47,6 @@ $result_trees{'ref_in_copying'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -360,7 +360,7 @@ $result_trees{'ref_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'ref_in_copying'} = '@copying
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index a26fb5291f..d5cb849be1 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
@@ -28,7 +28,8 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'ref',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -46,7 +47,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'ref',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -428,7 +428,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'ref_in_copying_insert_in_chapter'} = '@copying
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 9623cdd019..9be174f297 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -28,12 +28,12 @@ $result_trees{'today_in_copying'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'today',
+                      'contents' => [
                         {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'today',
                       'source_info' => {
                         'line_nr' => 2
                       }
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index c855b5ae35..0b97f87d74 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -35,7 +35,8 @@ $result_trees{'anchor_zero'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -45,7 +46,6 @@ $result_trees{'anchor_zero'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => '0'
@@ -71,7 +71,8 @@ $result_trees{'anchor_zero'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -89,7 +90,6 @@ $result_trees{'anchor_zero'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -118,7 +118,7 @@ $result_trees{'anchor_zero'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 69fc811223..c031fa9aae 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -18,7 +18,8 @@ $result_trees{'at_commands_in_node'} = {
               'text' => 'A '
             },
             {
-              'args' => [
+              'cmdname' => 'sc',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'at_commands_in_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'sc',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -37,7 +37,8 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' node '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -47,7 +48,6 @@ $result_trees{'at_commands_in_node'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -56,11 +56,13 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '"',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'dotless',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -70,7 +72,6 @@ $result_trees{'at_commands_in_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'dotless',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -79,7 +80,6 @@ $result_trees{'at_commands_in_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '"',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -88,11 +88,13 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => '`',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '=',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -102,7 +104,6 @@ $result_trees{'at_commands_in_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '=',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -111,7 +112,6 @@ $result_trees{'at_commands_in_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '`',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -120,12 +120,12 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'l',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'l',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -134,11 +134,13 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '\'',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -148,7 +150,6 @@ $result_trees{'at_commands_in_node'} = {
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '\'',
                       'source_info' => {
                         'line_nr' => 1
                       }
@@ -157,7 +158,6 @@ $result_trees{'at_commands_in_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -166,12 +166,12 @@ $result_trees{'at_commands_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'exclamdown',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'exclamdown',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 8efbd3f21b..0519008298 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -73,7 +73,8 @@ $result_trees{'double_node_anchor_float'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -83,7 +84,6 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'normalized' => 'node1'
           },
@@ -102,7 +102,8 @@ $result_trees{'double_node_anchor_float'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -112,7 +113,6 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'anchor1'
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 b71b070fdc..225e2cc4fe 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
@@ -117,7 +117,8 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -135,7 +136,6 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -178,7 +178,8 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'text' => 'to '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -196,7 +197,6 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -228,8 +228,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_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 3adcd32a75..feb361c606 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
@@ -117,7 +117,8 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -135,7 +136,6 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -178,7 +178,8 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'text' => 'to '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -196,7 +197,6 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -228,8 +228,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_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 b76fc8989e..91cd151bd6 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -51,7 +51,8 @@ $result_trees{'double_recursive_self_section_reference'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -69,7 +70,6 @@ $result_trees{'double_recursive_self_section_reference'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -140,7 +140,8 @@ $result_trees{'double_recursive_self_section_reference'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -158,7 +159,6 @@ $result_trees{'double_recursive_self_section_reference'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -189,8 +189,8 @@ $result_trees{'double_recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 ba143e135a..6eee4651ed 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -127,7 +127,8 @@ $result_trees{'double_top'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -137,7 +138,6 @@ $result_trees{'double_top'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'normalized' => 'Top'
           },
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index 339d9bbed4..cb9a8cca7b 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -15,7 +15,8 @@ $result_trees{'email_in_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -33,7 +34,6 @@ $result_trees{'email_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -42,7 +42,8 @@ $result_trees{'email_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -70,7 +71,6 @@ $result_trees{'email_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -79,7 +79,8 @@ $result_trees{'email_in_node'} = {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'email',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -102,7 +103,6 @@ $result_trees{'email_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'email',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/sectioning/empty_anchor.pl 
b/tp/t/results/sectioning/empty_anchor.pl
index 0b1c0caed4..aa2aa0cdda 100644
--- a/tp/t/results/sectioning/empty_anchor.pl
+++ b/tp/t/results/sectioning/empty_anchor.pl
@@ -10,12 +10,12 @@ $result_trees{'empty_anchor'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'source_info' => {
             'line_nr' => 1
           }
@@ -27,7 +27,8 @@ $result_trees{'empty_anchor'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'info' => {
                     'spaces_before_argument' => {
@@ -37,7 +38,6 @@ $result_trees{'empty_anchor'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index 3229a53033..fa7af2d590 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -106,7 +106,8 @@ $result_trees{'empty_nodes_with_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -116,7 +117,6 @@ $result_trees{'empty_nodes_with_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 6
               }
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 99f4e7ebcc..b810d78efc 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -37,7 +37,8 @@ $result_trees{'empty_ref_arg'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -68,7 +69,6 @@ $result_trees{'empty_ref_arg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -78,7 +78,8 @@ $result_trees{'empty_ref_arg'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -117,7 +118,6 @@ $result_trees{'empty_ref_arg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 4
               }
@@ -127,7 +127,8 @@ $result_trees{'empty_ref_arg'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -171,7 +172,6 @@ $result_trees{'empty_ref_arg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -181,7 +181,8 @@ $result_trees{'empty_ref_arg'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -269,7 +270,6 @@ $result_trees{'empty_ref_arg'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -298,10 +298,10 @@ $result_trees{'empty_ref_arg'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$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_texis{'empty_ref_arg'} = '@node first
 
diff --git a/tp/t/results/sectioning/empty_refs.pl 
b/tp/t/results/sectioning/empty_refs.pl
index 7fa52a191f..dfae14f2e3 100644
--- a/tp/t/results/sectioning/empty_refs.pl
+++ b/tp/t/results/sectioning/empty_refs.pl
@@ -12,7 +12,8 @@ $result_trees{'empty_refs'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -29,7 +30,6 @@ $result_trees{'empty_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -39,11 +39,13 @@ $result_trees{'empty_refs'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -53,7 +55,6 @@ $result_trees{'empty_refs'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 2
                       }
@@ -70,7 +71,6 @@ $result_trees{'empty_refs'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -88,8 +88,8 @@ $result_trees{'empty_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'empty_refs'} = '@xref{@:}.
 @xref{@asis{ }}.
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index ea7453e756..a97b87cb8f 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -35,11 +35,13 @@ $result_trees{'equivalent_labels'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'samp',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -49,7 +51,6 @@ $result_trees{'equivalent_labels'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'samp',
                   'source_info' => {
                     'line_nr' => 3
                   }
@@ -58,7 +59,6 @@ $result_trees{'equivalent_labels'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => 'anch'
@@ -239,7 +239,8 @@ $result_trees{'equivalent_labels'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -249,7 +250,6 @@ $result_trees{'equivalent_labels'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 11
                       }
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index d616ca8215..5d19d1dfe5 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -23,7 +23,8 @@ $result_trees{'equivalent_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -33,7 +34,6 @@ $result_trees{'equivalent_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -89,7 +89,8 @@ $result_trees{'equivalent_nodes'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -99,7 +100,6 @@ $result_trees{'equivalent_nodes'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -198,7 +198,8 @@ $result_trees{'equivalent_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -208,7 +209,6 @@ $result_trees{'equivalent_nodes'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -233,7 +233,8 @@ $result_trees{'equivalent_nodes'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -251,7 +252,6 @@ $result_trees{'equivalent_nodes'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -282,7 +282,7 @@ $result_trees{'equivalent_nodes'} = {
 };
 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_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 edfc02cff0..86d0b61a41 100644
--- a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -43,7 +43,8 @@ $result_trees{'equivalent_nodes_novalidate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 3
               }
@@ -109,7 +109,8 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'strong',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -119,7 +120,6 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'strong',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -218,7 +218,8 @@ $result_trees{'equivalent_nodes_novalidate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'samp',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -228,7 +229,6 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'samp',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -253,7 +253,8 @@ $result_trees{'equivalent_nodes_novalidate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -271,7 +272,6 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 11
               }
@@ -302,7 +302,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
 };
 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'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_texis{'equivalent_nodes_novalidate'} = '@novalidate
 
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 20b4669869..6fb84c75df 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -76,12 +76,12 @@ $result_trees{'no_argument_and_contents'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index ced32e810a..bd86e44ccd 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -415,12 +415,12 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'arg1 '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -434,7 +434,8 @@ $result_trees{'node_line_arguments'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => ',',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -444,7 +445,6 @@ $result_trees{'node_line_arguments'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => ',',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -472,7 +472,8 @@ $result_trees{'node_line_arguments'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -482,7 +483,6 @@ $result_trees{'node_line_arguments'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'source_info' => {
                 'line_nr' => 10
               }
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index dcfc78ecdf..3202932439 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -171,7 +171,8 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => '('
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -181,7 +182,6 @@ $result_trees{'node_nested_parentheses'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -247,7 +247,8 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => '('
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -257,7 +258,6 @@ $result_trees{'node_nested_parentheses'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 7
                       }
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index c7743f621c..258cdf0932 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -137,7 +137,8 @@ $result_trees{'node_referenced_in_ref'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -155,7 +156,6 @@ $result_trees{'node_referenced_in_ref'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 7
               }
@@ -259,7 +259,7 @@ $result_trees{'node_referenced_in_ref'} = {
   'type' => 'document_root'
 };
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'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_texis{'node_referenced_in_ref'} = '@node Top
 
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 73cdba5857..e604ecf7ad 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -425,7 +425,8 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Dummy link to '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -443,7 +444,6 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 18
               }
@@ -466,7 +466,8 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Dummy link to '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -497,7 +498,6 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 20
               }
@@ -597,7 +597,8 @@ $result_trees{'nodename_parentheses'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -607,7 +608,6 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => '_0028manual_0029anchor'
@@ -650,9 +650,9 @@ 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[
 
$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'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'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_texis{'nodename_parentheses'} = '@node Top
 @top The top node
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 681c90fd07..a66b3a00f4 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -181,7 +181,8 @@ $result_trees{'novalidate'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -199,7 +200,6 @@ $result_trees{'novalidate'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 10
               }
@@ -230,7 +230,7 @@ $result_trees{'novalidate'} = {
 };
 
$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'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'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_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 8dd27d1b16..77b9c11a1c 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -76,7 +76,8 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               'text' => 'anchor ref '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'ref'
@@ -113,7 +113,8 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               'text' => 'ref to ref '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +132,6 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -161,7 +161,7 @@ $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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'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_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 cf46d83805..d35220e00d 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
@@ -76,7 +76,8 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
               'text' => 'anchor ref '
             },
             {
-              'args' => [
+              'cmdname' => 'anchor',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -86,7 +87,6 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'anchor',
               'extra' => {
                 'is_target' => 1,
                 'normalized' => 'ref'
@@ -113,7 +113,8 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
               'text' => 'ref to ref '
             },
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -131,7 +132,6 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 6
               }
@@ -161,7 +161,7 @@ 
$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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$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_texis{'one_node_explicit_directions_anchor_no_use_node'} = '@node one 
node,,,(dir)
 Top node
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 7c696f21ee..41c76647bb 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -95,7 +95,8 @@ $result_trees{'protected_node_parentheses'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -105,7 +106,6 @@ $result_trees{'protected_node_parentheses'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -205,7 +205,8 @@ $result_trees{'protected_node_parentheses'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -215,7 +216,6 @@ $result_trees{'protected_node_parentheses'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -241,11 +241,13 @@ $result_trees{'protected_node_parentheses'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -255,7 +257,6 @@ $result_trees{'protected_node_parentheses'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'asis',
                   'source_info' => {
                     'line_nr' => 11
                   }
@@ -267,7 +268,6 @@ $result_trees{'protected_node_parentheses'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => '_0028manual2_0029-name2'
@@ -289,11 +289,13 @@ $result_trees{'protected_node_parentheses'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'asis',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -303,7 +305,6 @@ $result_trees{'protected_node_parentheses'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'asis',
                       'source_info' => {
                         'line_nr' => 13
                       }
@@ -324,7 +325,6 @@ $result_trees{'protected_node_parentheses'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 13
               }
@@ -355,8 +355,8 @@ $result_trees{'protected_node_parentheses'} = {
 };
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'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_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 0cb2c22668..8ed20c74a5 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -51,7 +51,8 @@ $result_trees{'recursive_self_section_reference'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -69,7 +70,6 @@ $result_trees{'recursive_self_section_reference'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'line_nr' => 2
               }
@@ -103,7 +103,7 @@ $result_trees{'recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_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 c499f8aed3..7bf21822c3 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -75,7 +75,8 @@ $result_trees{'ref_to_top'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -93,7 +94,6 @@ $result_trees{'ref_to_top'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -119,7 +119,7 @@ $result_trees{'ref_to_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'ref_to_top'} = '
 @node ToP
diff --git a/tp/t/results/sectioning/ref_to_unknown_node.pl 
b/tp/t/results/sectioning/ref_to_unknown_node.pl
index fdbf96fb3e..411a05d522 100644
--- a/tp/t/results/sectioning/ref_to_unknown_node.pl
+++ b/tp/t/results/sectioning/ref_to_unknown_node.pl
@@ -12,7 +12,8 @@ $result_trees{'ref_to_unknown_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -30,7 +31,6 @@ $result_trees{'ref_to_unknown_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 1
               }
@@ -47,7 +47,7 @@ $result_trees{'ref_to_unknown_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_unknown_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_unknown_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_to_unknown_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_unknown_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_to_unknown_node'} = '@xref{unknown node}.';
 
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 90a638d7b4..a9a0ba6f5d 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
@@ -152,7 +152,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -188,7 +189,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
                 'line_nr' => 8
@@ -225,7 +225,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -235,7 +236,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
                 'line_nr' => 10
@@ -270,7 +270,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
                 'line_nr' => 11
@@ -306,11 +306,13 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ref',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -320,7 +322,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => 
'reference_to_only_special_spaces_node.texi',
                         'line_nr' => 13
@@ -340,7 +341,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -350,7 +352,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'file_name' => 
'reference_to_only_special_spaces_node.texi',
                         'line_nr' => 13
@@ -365,7 +366,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'ref',
               'source_info' => {
                 'file_name' => 'reference_to_only_special_spaces_node.texi',
                 'line_nr' => 13
@@ -415,8 +415,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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$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_texis{'reference_to_only_special_spaces_node'} = '
 @node Top
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index a4394134c3..6f5cee2a0b 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -54,7 +54,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '~',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -64,7 +65,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '~',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -159,7 +159,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => '^',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -169,7 +170,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                           'type' => 'following_arg'
                         }
                       ],
-                      'cmdname' => '^',
                       'source_info' => {
                         'line_nr' => 6
                       }
@@ -282,7 +282,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -292,7 +293,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'source_info' => {
                 'line_nr' => 9
               }
@@ -328,7 +328,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           {
             'contents' => [
               {
-                'args' => [
+                'cmdname' => '~',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -338,7 +339,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                     'type' => 'following_arg'
                   }
                 ],
-                'cmdname' => '~',
                 'source_info' => {
                   'line_nr' => 10
                 }
@@ -424,7 +424,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -434,7 +435,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '^',
               'source_info' => {
                 'line_nr' => 14
               }
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 976f82f893..0f590004a4 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -81,7 +81,8 @@ $result_trees{'unnumbered_before_top_node'} = [
             'type' => 'empty_line'
           },
           {
-            'args' => [
+            'cmdname' => 'titlefont',
+            'contents' => [
               {
                 'contents' => [
                   {
@@ -91,7 +92,6 @@ $result_trees{'unnumbered_before_top_node'} = [
                 'type' => 'brace_container'
               }
             ],
-            'cmdname' => 'titlefont',
             'extra' => {},
             'source_info' => {
               'line_nr' => 6
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 faf292ff3e..351e9adb89 100644
--- a/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
+++ b/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
@@ -116,18 +116,19 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'text' => 'chap'
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'comma'
+              ]
             },
             {
               'text' => ' '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -136,8 +137,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'code'
+              ]
             }
           ],
           'info' => {
@@ -168,7 +168,8 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'text' => 'chap, '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -178,7 +179,6 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
@@ -687,12 +687,12 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'asis'
+              ]
             },
             {
               'text' => ' 2'
@@ -723,12 +723,12 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'asis',
               'source_info' => {
                 'line_nr' => 23
               }
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl 
b/tp/t/results/transformations/protect_colon_source_mark.pl
index a64d78c699..9748ed59c4 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -101,7 +101,8 @@ $result_trees{'protect_colon_source_mark'} = {
               'text' => 'There is some text '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -110,8 +111,7 @@ $result_trees{'protect_colon_source_mark'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'asis'
+              ]
             },
             {
               'source_marks' => [
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl 
b/tp/t/results/transformations/protect_comma_source_mark.pl
index 4ed201c70b..ab77bded10 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -114,20 +114,20 @@ $result_trees{'protect_comma_source_mark'} = {
               'text' => 'There is some text '
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'comma'
+              ]
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_marks' => [
                 {
                   'counter' => 1,
@@ -137,17 +137,18 @@ $result_trees{'protect_comma_source_mark'} = {
               ]
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_marks' => [
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -156,8 +157,7 @@ $result_trees{'protect_comma_source_mark'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => ',,',
                   'sourcemark_type' => 'value_expansion',
@@ -166,20 +166,20 @@ $result_trees{'protect_comma_source_mark'} = {
               ]
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'comma'
+              ]
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'comma',
               'source_marks' => [
                 {
                   'counter' => 1,
@@ -189,12 +189,12 @@ $result_trees{'protect_comma_source_mark'} = {
               ]
             },
             {
-              'args' => [
+              'cmdname' => 'comma',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'comma'
+              ]
             },
             {
               'text' => ' and after.
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index a9810d3da2..da657131c9 100644
--- 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -68,11 +68,13 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -105,8 +107,7 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
                       ],
                       'type' => 'brace_container'
                     }
-                  ],
-                  'cmdname' => 'asis'
+                  ]
                 },
                 {
                   'text' => 'my_f)'
@@ -115,7 +116,6 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => '_0028my_005ff_0029'
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl 
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index 1182382833..1330e075a8 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -68,11 +68,13 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'anchor',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'asis',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -99,8 +101,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
                       ],
                       'type' => 'brace_container'
                     }
-                  ],
-                  'cmdname' => 'asis'
+                  ]
                 },
                 {
                   'source_marks' => [
@@ -117,7 +118,6 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'anchor',
           'extra' => {
             'is_target' => 1,
             'normalized' => '_0028some-text_0029-aa_002c_002c'
diff --git 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index a79eba6cdb..5672b03fe3 100644
--- 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -108,12 +108,12 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               'text' => ''
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'hashchar'
+              ]
             },
             {
               'source_marks' => [
@@ -219,12 +219,12 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               'text' => ''
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_marks' => [
                 {
                   'counter' => 2,
@@ -312,12 +312,12 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'hashchar'
+              ]
             },
             {
               'source_marks' => [
@@ -390,7 +390,8 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -399,8 +400,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '#',
                   'sourcemark_type' => 'value_expansion',
@@ -410,12 +410,12 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               'text' => ''
             },
             {
-              'args' => [
+              'cmdname' => 'hashchar',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'hashchar',
               'source_marks' => [
                 {
                   'counter' => 1,
diff --git 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index 3a139b7b35..9590c6598c 100644
--- 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++ 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -114,7 +114,8 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
               'text' => 'There is some text '
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -128,7 +129,8 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -137,8 +139,7 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => ',.',
                           'position' => 3,
@@ -157,14 +158,14 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'asis'
+              ]
             },
             {
               'text' => ' and after'
             },
             {
-              'args' => [
+              'cmdname' => 'asis',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -173,8 +174,7 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'asis'
+              ]
             },
             {
               'text' => '
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index 468d5bca25..4d2d87a351 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -102,7 +102,8 @@ $result_trees{'bad_syntax'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -111,8 +112,7 @@ $result_trees{'bad_syntax'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         },
         {
           'text' => '
diff --git a/tp/t/results/value/begin_like_comment_on_set_line.pl 
b/tp/t/results/value/begin_like_comment_on_set_line.pl
index bf06c958cf..55786b0247 100644
--- a/tp/t/results/value/begin_like_comment_on_set_line.pl
+++ b/tp/t/results/value/begin_like_comment_on_set_line.pl
@@ -44,7 +44,8 @@ $result_trees{'begin_like_comment_on_set_line'} = {
               'text' => '!'
             },
             {
-              'args' => [
+              'cmdname' => 'value',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,15 +54,15 @@ $result_trees{'begin_like_comment_on_set_line'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'value'
+              ]
             },
             {
               'source_marks' => [
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -70,8 +71,7 @@ $result_trees{'begin_like_comment_on_set_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'some thing @commentary is it',
                   'position' => 3,
diff --git a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl 
b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
index 6c0ad545d7..470dbc82d0 100644
--- a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
+++ b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
@@ -34,7 +34,8 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -50,7 +51,8 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -59,8 +61,7 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => '}',
                           'position' => 5,
@@ -80,7 +81,6 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'html'
@@ -115,7 +115,8 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = 
{
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -137,7 +138,6 @@ after
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
diff --git a/tp/t/results/value/comment_on_clear_line.pl 
b/tp/t/results/value/comment_on_clear_line.pl
index a7f9f6410c..e6a28b5a76 100644
--- a/tp/t/results/value/comment_on_clear_line.pl
+++ b/tp/t/results/value/comment_on_clear_line.pl
@@ -133,7 +133,8 @@ $result_trees{'comment_on_clear_line'} = {
               'text' => '!'
             },
             {
-              'args' => [
+              'cmdname' => 'value',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,14 +143,14 @@ $result_trees{'comment_on_clear_line'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'value'
+              ]
             },
             {
               'text' => '!, !'
             },
             {
-              'args' => [
+              'cmdname' => 'value',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -158,15 +159,15 @@ $result_trees{'comment_on_clear_line'} = {
                   ],
                   'type' => 'brace_container'
                 }
-              ],
-              'cmdname' => 'value'
+              ]
             },
             {
               'source_marks' => [
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -175,8 +176,7 @@ $result_trees{'comment_on_clear_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'g',
                   'position' => 4,
@@ -192,7 +192,8 @@ $result_trees{'comment_on_clear_line'} = {
                 {
                   'counter' => 2,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -201,8 +202,7 @@ $result_trees{'comment_on_clear_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'a vv',
                   'position' => 9,
diff --git a/tp/t/results/value/comment_on_set_line.pl 
b/tp/t/results/value/comment_on_set_line.pl
index 074af1aab0..ece939142c 100644
--- a/tp/t/results/value/comment_on_set_line.pl
+++ b/tp/t/results/value/comment_on_set_line.pl
@@ -89,7 +89,8 @@ $result_trees{'comment_on_set_line'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -98,8 +99,7 @@ $result_trees{'comment_on_set_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '',
                   'position' => 1,
@@ -115,7 +115,8 @@ $result_trees{'comment_on_set_line'} = {
                 {
                   'counter' => 2,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -124,8 +125,7 @@ $result_trees{'comment_on_set_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '',
                   'position' => 5,
@@ -141,7 +141,8 @@ $result_trees{'comment_on_set_line'} = {
                 {
                   'counter' => 3,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -150,8 +151,7 @@ $result_trees{'comment_on_set_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'g',
                   'position' => 9,
@@ -167,7 +167,8 @@ $result_trees{'comment_on_set_line'} = {
                 {
                   'counter' => 4,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -176,8 +177,7 @@ $result_trees{'comment_on_set_line'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'a vv',
                   'position' => 14,
diff --git a/tp/t/results/value/empty_set.pl b/tp/t/results/value/empty_set.pl
index d190e2e5d8..42d61d7429 100644
--- a/tp/t/results/value/empty_set.pl
+++ b/tp/t/results/value/empty_set.pl
@@ -38,7 +38,8 @@ $result_trees{'empty_set'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -47,8 +48,7 @@ $result_trees{'empty_set'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '',
                   'position' => 2,
diff --git a/tp/t/results/value/empty_value_in_line.pl 
b/tp/t/results/value/empty_value_in_line.pl
index 6c3abd2452..c56228ac1e 100644
--- a/tp/t/results/value/empty_value_in_line.pl
+++ b/tp/t/results/value/empty_value_in_line.pl
@@ -45,7 +45,8 @@ $result_trees{'empty_value_in_line'} = {
             {
               'counter' => 1,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -54,8 +55,7 @@ $result_trees{'empty_value_in_line'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '',
               'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/ignored_value_definition.pl 
b/tp/t/results/value/ignored_value_definition.pl
index 457eec6b94..505ff77163 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -34,7 +34,8 @@ $result_trees{'ignored_value_definition'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -55,7 +56,6 @@ $result_trees{'ignored_value_definition'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'tex'
               },
@@ -82,7 +82,8 @@ $result_trees{'ignored_value_definition'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -91,8 +92,7 @@ $result_trees{'ignored_value_definition'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'outside',
                   'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/not_only_characters.pl 
b/tp/t/results/value/not_only_characters.pl
index 83d1d2efb0..ccbb2f94cb 100644
--- a/tp/t/results/value/not_only_characters.pl
+++ b/tp/t/results/value/not_only_characters.pl
@@ -38,7 +38,8 @@ $result_trees{'not_only_characters'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -47,8 +48,7 @@ $result_trees{'not_only_characters'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'hh',
                   'position' => 4,
diff --git a/tp/t/results/value/recursive_expansion_in_set.pl 
b/tp/t/results/value/recursive_expansion_in_set.pl
index 209744485d..7605b098b4 100644
--- a/tp/t/results/value/recursive_expansion_in_set.pl
+++ b/tp/t/results/value/recursive_expansion_in_set.pl
@@ -31,7 +31,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 1,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -40,8 +41,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -50,7 +50,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 2,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -59,8 +60,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -69,7 +69,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 3,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -78,8 +79,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -88,7 +88,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 4,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -97,8 +98,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -107,7 +107,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 5,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -116,8 +117,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -126,7 +126,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 6,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -135,8 +136,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -145,7 +145,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 7,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -154,8 +155,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -164,7 +164,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 8,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -173,8 +174,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -183,7 +183,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 9,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -192,8 +193,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -202,7 +202,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 10,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -211,8 +212,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -221,7 +221,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 11,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -230,8 +231,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -240,7 +240,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 12,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -249,8 +250,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -259,7 +259,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 13,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -268,8 +269,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -278,7 +278,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 14,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -287,8 +288,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -297,7 +297,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 15,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -306,8 +307,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -316,7 +316,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 16,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -325,8 +326,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -335,7 +335,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 17,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -344,8 +345,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -354,7 +354,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 18,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -363,8 +364,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -373,7 +373,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 19,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -382,8 +383,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -392,7 +392,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 20,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -401,8 +402,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -411,7 +411,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 21,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -420,8 +421,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -430,7 +430,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 22,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -439,8 +440,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -449,7 +449,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 23,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -458,8 +459,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -468,7 +468,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 24,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -477,8 +478,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -487,7 +487,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 25,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -496,8 +497,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -506,7 +506,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 26,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -515,8 +516,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -525,7 +525,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 27,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -534,8 +535,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -544,7 +544,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 28,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -553,8 +554,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -563,7 +563,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 29,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -572,8 +573,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -582,7 +582,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 30,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -591,8 +592,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -601,7 +601,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 31,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -610,8 +611,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -620,7 +620,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 32,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -629,8 +630,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -639,7 +639,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 33,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -648,8 +649,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -658,7 +658,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 34,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -667,8 +668,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -677,7 +677,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 35,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -686,8 +687,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -696,7 +696,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 36,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -705,8 +706,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -715,7 +715,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 37,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -724,8 +725,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -734,7 +734,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 38,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -743,8 +744,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -753,7 +753,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 39,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -762,8 +763,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -772,7 +772,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 40,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -781,8 +782,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -791,7 +791,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 41,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -800,8 +801,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -810,7 +810,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 42,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -819,8 +820,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -829,7 +829,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 43,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -838,8 +839,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -848,7 +848,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 44,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -857,8 +858,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -867,7 +867,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 45,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -876,8 +877,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -886,7 +886,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 46,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -895,8 +896,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -905,7 +905,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 47,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -914,8 +915,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -924,7 +924,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 48,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -933,8 +934,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -943,7 +943,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 49,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -952,8 +953,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -962,7 +962,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 50,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -971,8 +972,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -981,7 +981,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 51,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -990,8 +991,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1000,7 +1000,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 52,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1009,8 +1010,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1019,7 +1019,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 53,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1028,8 +1029,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1038,7 +1038,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 54,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1047,8 +1048,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1057,7 +1057,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 55,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1066,8 +1067,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1076,7 +1076,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 56,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1085,8 +1086,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1095,7 +1095,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 57,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1104,8 +1105,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1114,7 +1114,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 58,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1123,8 +1124,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1133,7 +1133,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 59,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1142,8 +1143,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1152,7 +1152,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 60,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1161,8 +1162,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1171,7 +1171,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 61,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1180,8 +1181,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1190,7 +1190,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 62,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1199,8 +1200,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1209,7 +1209,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 63,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1218,8 +1219,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1228,7 +1228,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 64,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1237,8 +1238,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1247,7 +1247,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 65,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1256,8 +1257,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1266,7 +1266,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 66,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1275,8 +1276,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1285,7 +1285,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 67,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1294,8 +1295,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1304,7 +1304,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 68,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1313,8 +1314,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1323,7 +1323,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 69,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1332,8 +1333,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1342,7 +1342,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 70,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1351,8 +1352,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1361,7 +1361,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 71,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1370,8 +1371,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1380,7 +1380,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 72,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1389,8 +1390,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1399,7 +1399,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 73,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1408,8 +1409,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1418,7 +1418,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 74,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1427,8 +1428,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1437,7 +1437,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 75,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1446,8 +1447,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1456,7 +1456,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 76,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1465,8 +1466,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1475,7 +1475,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 77,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1484,8 +1485,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1494,7 +1494,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 78,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1503,8 +1504,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1513,7 +1513,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 79,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1522,8 +1523,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1532,7 +1532,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 80,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1541,8 +1542,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1551,7 +1551,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 81,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1560,8 +1561,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1570,7 +1570,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 82,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1579,8 +1580,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1589,7 +1589,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 83,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1598,8 +1599,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1608,7 +1608,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 84,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1617,8 +1618,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1627,7 +1627,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 85,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1636,8 +1637,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1646,7 +1646,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 86,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1655,8 +1656,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1665,7 +1665,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 87,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1674,8 +1675,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1684,7 +1684,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 88,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1693,8 +1694,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1703,7 +1703,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 89,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1712,8 +1713,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1722,7 +1722,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 90,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1731,8 +1732,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1741,7 +1741,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 91,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1750,8 +1751,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1760,7 +1760,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 92,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1769,8 +1770,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1779,7 +1779,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 93,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1788,8 +1789,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1798,7 +1798,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 94,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1807,8 +1808,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1817,7 +1817,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 95,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1826,8 +1827,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1836,7 +1836,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 96,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1845,8 +1846,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1855,7 +1855,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 97,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1864,8 +1865,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1874,7 +1874,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 98,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1883,8 +1884,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1893,7 +1893,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 99,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1902,8 +1903,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
@@ -1912,7 +1912,8 @@ $result_trees{'recursive_expansion_in_set'} = {
             {
               'counter' => 100,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1921,8 +1922,7 @@ $result_trees{'recursive_expansion_in_set'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@value{V}',
               'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl 
b/tp/t/results/value/set_flag_command_equivalent.pl
index 1836c9e47c..0573fee838 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -53,7 +53,8 @@ $result_trees{'set_flag_command_equivalent'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -62,8 +63,7 @@ $result_trees{'set_flag_command_equivalent'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '',
                   'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/set_form_feed.pl 
b/tp/t/results/value/set_form_feed.pl
index c4750d44af..d19ace2d02 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -68,7 +68,8 @@ $result_trees{'set_form_feed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -76,7 +77,8 @@ $result_trees{'set_form_feed'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -85,8 +87,7 @@ $result_trees{'set_form_feed'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'a\\a\\f\\\\',
                           'sourcemark_type' => 'value_expansion',
@@ -101,7 +102,8 @@ $result_trees{'set_form_feed'} = {
                         {
                           'counter' => 2,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -110,8 +112,7 @@ $result_trees{'set_form_feed'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => '',
                           'position' => 9,
@@ -127,7 +128,8 @@ $result_trees{'set_form_feed'} = {
                         {
                           'counter' => 3,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -136,8 +138,7 @@ $result_trees{'set_form_feed'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => '',
                           'position' => 11,
@@ -157,7 +158,6 @@ $result_trees{'set_form_feed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index 30000a4c9f..8f159fd93c 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -38,7 +38,8 @@ $result_trees{'simple'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -47,8 +48,7 @@ $result_trees{'simple'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'the value @b{b}',
                   'sourcemark_type' => 'value_expansion',
@@ -58,7 +58,8 @@ $result_trees{'simple'} = {
               'text' => 'the value '
             },
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -68,7 +69,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 3
               },
diff --git a/tp/t/results/value/spaces_before_value.pl 
b/tp/t/results/value/spaces_before_value.pl
index 284661e171..0fc5c7cd58 100644
--- a/tp/t/results/value/spaces_before_value.pl
+++ b/tp/t/results/value/spaces_before_value.pl
@@ -38,7 +38,8 @@ $result_trees{'spaces_before_value'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -48,7 +49,6 @@ $result_trees{'spaces_before_value'} = {
                         'type' => 'brace_container'
                       }
                     ],
-                    'cmdname' => 'value',
                     'info' => {
                       'spaces_after_cmd_before_arg' => {
                         'text' => '  '
diff --git a/tp/t/results/value/unknown_value_after_spaces.pl 
b/tp/t/results/value/unknown_value_after_spaces.pl
index dcb6adb87b..6669b01071 100644
--- a/tp/t/results/value/unknown_value_after_spaces.pl
+++ b/tp/t/results/value/unknown_value_after_spaces.pl
@@ -14,7 +14,8 @@ $result_trees{'unknown_value_after_spaces'} = {
           'type' => 'spaces_before_paragraph'
         },
         {
-          'args' => [
+          'cmdname' => 'value',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -23,8 +24,7 @@ $result_trees{'unknown_value_after_spaces'} = {
               ],
               'type' => 'brace_container'
             }
-          ],
-          'cmdname' => 'value'
+          ]
         },
         {
           'text' => '  '
diff --git a/tp/t/results/value/value_after_accent.pl 
b/tp/t/results/value/value_after_accent.pl
index 5dbb0d3736..24e84ab965 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -29,7 +29,8 @@ $result_trees{'value_after_accent'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -39,14 +40,14 @@ $result_trees{'value_after_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
                     {
                       'counter' => 1,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -55,8 +56,7 @@ $result_trees{'value_after_accent'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'a',
                       'position' => 1,
@@ -83,7 +83,8 @@ $result_trees{'value_after_accent'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '~',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -93,14 +94,14 @@ $result_trees{'value_after_accent'} = {
                   'type' => 'following_arg'
                 }
               ],
-              'cmdname' => '~',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
                     {
                       'counter' => 2,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -109,8 +110,7 @@ $result_trees{'value_after_accent'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'a',
                       'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/value_after_brace_command.pl 
b/tp/t/results/value/value_after_brace_command.pl
index 3e835ffa5b..8c11d8bda5 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -51,7 +51,8 @@ $result_trees{'value_after_brace_command'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'ringaccent',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -61,14 +62,14 @@ $result_trees{'value_after_brace_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'ringaccent',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
                     {
                       'counter' => 1,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -77,8 +78,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '{a}',
                       'position' => 1,
@@ -112,7 +112,8 @@ $result_trees{'value_after_brace_command'} = {
                     {
                       'counter' => 2,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -121,8 +122,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '@unknown',
                       'position' => 1,
@@ -149,7 +149,8 @@ $result_trees{'value_after_brace_command'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => '^',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -159,14 +160,14 @@ $result_trees{'value_after_brace_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => '^',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
                     {
                       'counter' => 3,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -175,8 +176,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '{a}',
                       'position' => 1,
@@ -210,7 +210,8 @@ $result_trees{'value_after_brace_command'} = {
                     {
                       'counter' => 4,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -219,8 +220,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '@unknown',
                       'position' => 1,
@@ -247,7 +247,8 @@ $result_trees{'value_after_brace_command'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'code',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -257,14 +258,14 @@ $result_trees{'value_after_brace_command'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'code',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
                     {
                       'counter' => 5,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -273,8 +274,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '{a}',
                       'position' => 1,
@@ -308,7 +308,8 @@ $result_trees{'value_after_brace_command'} = {
                     {
                       'counter' => 6,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -317,8 +318,7 @@ $result_trees{'value_after_brace_command'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => '@unknown',
                       'position' => 1,
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index eedbb3da0e..d6ec79042c 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -80,7 +80,8 @@ $result_trees{'value_in_index_commands'} = {
                     {
                       'counter' => 2,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -89,8 +90,7 @@ $result_trees{'value_in_index_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'fn',
                       'position' => 3,
@@ -129,7 +129,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -138,8 +139,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'cp',
                   'position' => 1,
@@ -157,7 +157,8 @@ $result_trees{'value_in_index_commands'} = {
             {
               'counter' => 3,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -166,8 +167,7 @@ $result_trees{'value_in_index_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@syncodeindex',
               'sourcemark_type' => 'value_expansion',
@@ -285,7 +285,8 @@ $result_trees{'value_in_index_commands'} = {
                     {
                       'counter' => 4,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -294,8 +295,7 @@ $result_trees{'value_in_index_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'truc',
                       'position' => 1,
@@ -403,7 +403,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 5,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -412,8 +413,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'codeidx',
                   'position' => 1,
@@ -513,7 +513,8 @@ $result_trees{'value_in_index_commands'} = {
             {
               'counter' => 6,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -522,8 +523,7 @@ $result_trees{'value_in_index_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@trucindex',
               'position' => 1,
@@ -591,7 +591,8 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'a '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -601,7 +602,6 @@ $result_trees{'value_in_index_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 27
                   }
@@ -610,7 +610,8 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => ' t'
                 },
                 {
-                  'args' => [
+                  'cmdname' => '\'',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -620,7 +621,6 @@ $result_trees{'value_in_index_commands'} = {
                       'type' => 'following_arg'
                     }
                   ],
-                  'cmdname' => '\'',
                   'source_info' => {
                     'line_nr' => 27
                   }
@@ -629,11 +629,13 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => ' '
                 },
                 {
-                  'args' => [
+                  'cmdname' => '^',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'dotless',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -643,7 +645,6 @@ $result_trees{'value_in_index_commands'} = {
                               'type' => 'brace_container'
                             }
                           ],
-                          'cmdname' => 'dotless',
                           'source_info' => {
                             'line_nr' => 27
                           }
@@ -652,7 +653,6 @@ $result_trees{'value_in_index_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '^',
                   'source_info' => {
                     'line_nr' => 27
                   },
@@ -689,7 +689,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 7,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -698,8 +699,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'a @var{index entry} t@\'e @^{@dotless{i}}',
                   'position' => 1,
@@ -760,7 +760,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 8,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -769,8 +770,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'truc',
                   'position' => 1,
@@ -795,7 +795,8 @@ $result_trees{'value_in_index_commands'} = {
                     {
                       'counter' => 9,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -804,8 +805,7 @@ $result_trees{'value_in_index_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'codeidx',
                       'position' => 7,
@@ -901,7 +901,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 10,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -910,8 +911,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'truc',
                   'position' => 1,
@@ -977,7 +977,8 @@ $result_trees{'value_in_index_commands'} = {
                 {
                   'counter' => 11,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -986,8 +987,7 @@ $result_trees{'value_in_index_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'cp',
                   'position' => 1,
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl 
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index ef009786d2..e7bc12045a 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -61,7 +61,8 @@ $result_trees{'value_in_invalid_documentencoding'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -70,8 +71,7 @@ $result_trees{'value_in_invalid_documentencoding'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'bad',
                   'position' => 1,
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index e755c7a5f0..78d19059a5 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -74,7 +74,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -83,8 +84,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'atext',
                   'position' => 4,
@@ -161,7 +161,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 2,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -170,8 +171,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'atext',
                       'position' => 14,
@@ -342,7 +342,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 3,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -351,8 +352,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '200mm,150mm',
                   'position' => 1,
@@ -405,7 +405,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 4,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -414,8 +415,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@afourpaper',
               'sourcemark_type' => 'value_expansion',
@@ -450,7 +450,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 5,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -459,8 +460,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'atext',
                       'position' => 27,
@@ -506,7 +506,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 6,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -515,8 +516,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'atext',
                       'position' => 18,
@@ -561,7 +561,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 7,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -570,8 +571,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'atext',
                       'position' => 31,
@@ -696,7 +696,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 8,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -705,8 +706,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '0.1',
                   'position' => 1,
@@ -783,7 +783,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 9,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -792,8 +793,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@raisesections',
               'sourcemark_type' => 'value_expansion',
@@ -836,7 +836,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 10,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -845,8 +846,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@lowersections',
               'sourcemark_type' => 'value_expansion',
@@ -961,7 +961,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phoo',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -971,7 +972,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phoo',
               'extra' => {
                 'begin' => '//',
                 'end' => '\\\\'
@@ -1090,7 +1090,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 11,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1099,8 +1100,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'phi',
                   'position' => 1,
@@ -1123,7 +1123,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'phi',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1133,7 +1134,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'phi',
               'extra' => {
                 'begin' => ':',
                 'end' => ':'
@@ -1197,7 +1197,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 12,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1206,8 +1207,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@strong',
               'position' => 1,
@@ -1222,7 +1222,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1232,7 +1233,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'info' => {
                 'spaces_after_cmd_before_arg' => {
                   'source_marks' => [
@@ -1276,7 +1276,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 14,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -1285,8 +1286,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'strong',
                       'position' => 8,
@@ -1326,7 +1326,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 13,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1335,8 +1336,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'strong',
                   'position' => 1,
@@ -1356,7 +1356,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 15,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -1365,8 +1366,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@strong',
               'position' => 1,
@@ -1381,7 +1381,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'strong',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1391,7 +1392,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'strong',
               'extra' => {
                 'begin' => '(strong:',
                 'end' => ':)'
@@ -1429,7 +1429,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1439,7 +1440,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'source_info' => {
                 'line_nr' => 56
               }
@@ -1510,7 +1510,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 16,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1519,8 +1520,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'code',
                   'position' => 1,
@@ -1543,7 +1543,8 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'kbd',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1553,7 +1554,6 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'kbd',
               'extra' => {
                 'code' => 1
               },
@@ -1590,7 +1590,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1600,7 +1601,6 @@ $result_trees{'value_in_misc_commands'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'kbd',
                   'extra' => {
                     'code' => 1
                   },
@@ -1782,7 +1782,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 17,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1791,8 +1792,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'asis',
                   'position' => 1,
@@ -1844,7 +1844,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 18,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1853,8 +1854,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '0',
                   'position' => 1,
@@ -1906,7 +1906,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 19,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1915,8 +1916,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'none',
                   'position' => 1,
@@ -1968,7 +1968,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 20,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -1977,8 +1978,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '4',
                   'position' => 1,
@@ -2030,7 +2030,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 21,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2039,8 +2040,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'none',
                   'position' => 1,
@@ -2092,7 +2092,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 22,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2101,8 +2102,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '6',
                   'position' => 1,
@@ -2193,7 +2193,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 23,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2202,8 +2203,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'end',
                   'position' => 1,
@@ -2255,7 +2255,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 24,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2264,8 +2265,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'separate',
                   'position' => 1,
@@ -2338,7 +2338,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 25,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2347,8 +2348,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'ISO-8859-1',
                   'position' => 1,
@@ -2447,7 +2447,8 @@ $result_trees{'value_in_misc_commands'} = {
                     {
                       'counter' => 26,
                       'element' => {
-                        'args' => [
+                        'cmdname' => 'value',
+                        'contents' => [
                           {
                             'contents' => [
                               {
@@ -2456,8 +2457,7 @@ $result_trees{'value_in_misc_commands'} = {
                             ],
                             'type' => 'brace_container'
                           }
-                        ],
-                        'cmdname' => 'value'
+                        ]
                       },
                       'line' => 'en',
                       'position' => 2,
@@ -2487,7 +2487,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 27,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2496,8 +2497,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@documentlanguage',
                   'position' => 29,
@@ -2628,7 +2628,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 28,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2637,8 +2638,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'on',
                   'position' => 1,
@@ -2690,7 +2690,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 29,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2699,8 +2700,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'off',
                   'position' => 1,
@@ -2784,7 +2784,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 30,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2793,8 +2794,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '10',
                   'position' => 1,
@@ -2905,7 +2905,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 31,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2914,8 +2915,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'false',
                   'position' => 1,
@@ -2972,7 +2972,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 32,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -2981,8 +2982,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'true',
                   'position' => 1,
@@ -3068,7 +3068,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 33,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -3077,8 +3078,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@page',
                   'position' => 5,
@@ -3113,7 +3113,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 34,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3122,8 +3123,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@noindent',
               'position' => 1,
@@ -3159,7 +3159,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 35,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -3168,8 +3169,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@noindent',
                   'position' => 30,
@@ -3207,7 +3207,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 36,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -3216,8 +3217,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@noindent',
                   'position' => 2,
@@ -3298,7 +3298,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 37,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -3307,8 +3308,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@page',
                   'position' => 5,
@@ -3363,7 +3363,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 38,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3372,8 +3373,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@contents',
               'sourcemark_type' => 'value_expansion',
@@ -3440,7 +3440,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 39,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3449,8 +3450,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@exdent',
               'sourcemark_type' => 'value_expansion',
@@ -3551,7 +3551,8 @@ $result_trees{'value_in_misc_commands'} = {
                 {
                   'counter' => 40,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -3560,8 +3561,7 @@ $result_trees{'value_in_misc_commands'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '2',
                   'position' => 1,
@@ -3625,7 +3625,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 41,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3634,8 +3635,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@contents',
               'position' => 1,
@@ -3692,7 +3692,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 42,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3701,8 +3702,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@shortcontents',
               'sourcemark_type' => 'value_expansion',
@@ -3756,7 +3756,8 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'counter' => 43,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -3765,8 +3766,7 @@ $result_trees{'value_in_misc_commands'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => '@bye',
               'position' => 1,
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index ac7d88951d..b48f60e34b 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -192,7 +192,8 @@ $result_trees{'value_in_node'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -201,8 +202,7 @@ $result_trees{'value_in_node'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'Node 1',
                           'sourcemark_type' => 'value_expansion',
@@ -387,7 +387,8 @@ $result_trees{'value_in_node'} = {
             {
               'counter' => 2,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -396,8 +397,7 @@ $result_trees{'value_in_node'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => 'Node 1',
               'position' => 1,
@@ -485,7 +485,8 @@ $result_trees{'value_in_node'} = {
                         {
                           'counter' => 3,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -494,8 +495,7 @@ $result_trees{'value_in_node'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'Section 1.1',
                           'sourcemark_type' => 'value_expansion',
@@ -673,7 +673,8 @@ $result_trees{'value_in_node'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'xref',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -681,7 +682,8 @@ $result_trees{'value_in_node'} = {
                         {
                           'counter' => 4,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -690,8 +692,7 @@ $result_trees{'value_in_node'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => 'Node 1',
                           'sourcemark_type' => 'value_expansion',
@@ -718,7 +719,6 @@ $result_trees{'value_in_node'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'xref',
               'source_info' => {
                 'line_nr' => 21
               }
@@ -757,7 +757,7 @@ 
$result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'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]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'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 89f199040a..2dba058a95 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -72,7 +72,8 @@ $result_trees{'value_node_directions'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -81,8 +82,7 @@ $result_trees{'value_node_directions'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'bar',
                   'position' => 1,
@@ -175,7 +175,8 @@ $result_trees{'value_node_directions'} = {
                 {
                   'counter' => 2,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -184,8 +185,7 @@ $result_trees{'value_node_directions'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'bar',
                   'position' => 4,
@@ -220,7 +220,8 @@ $result_trees{'value_node_directions'} = {
                 {
                   'counter' => 3,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -229,8 +230,7 @@ $result_trees{'value_node_directions'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'bar',
                   'sourcemark_type' => 'value_expansion',
@@ -367,7 +367,8 @@ $result_trees{'value_node_directions'} = {
             {
               'counter' => 4,
               'element' => {
-                'args' => [
+                'cmdname' => 'value',
+                'contents' => [
                   {
                     'contents' => [
                       {
@@ -376,8 +377,7 @@ $result_trees{'value_node_directions'} = {
                     ],
                     'type' => 'brace_container'
                   }
-                ],
-                'cmdname' => 'value'
+                ]
               },
               'line' => 'bar',
               'position' => 1,
@@ -475,7 +475,8 @@ $result_trees{'value_node_directions'} = {
                 {
                   'counter' => 5,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -484,8 +485,7 @@ $result_trees{'value_node_directions'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => 'bar',
                   'position' => 1,
diff --git a/tp/t/results/value/value_zero.pl b/tp/t/results/value/value_zero.pl
index bc6f4ad73b..678619ef5c 100644
--- a/tp/t/results/value/value_zero.pl
+++ b/tp/t/results/value/value_zero.pl
@@ -37,7 +37,8 @@ $result_trees{'value_zero'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -46,8 +47,7 @@ $result_trees{'value_zero'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '0',
                   'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl 
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index a9f6afd6e0..cf60fa4021 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -134,7 +134,8 @@ $result_trees{'comma_value_in_macro_arg'} = {
               'text' => 'result: '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -142,7 +143,8 @@ $result_trees{'comma_value_in_macro_arg'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -151,8 +153,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => ',',
                           'position' => 5,
@@ -172,7 +173,6 @@ $result_trees{'comma_value_in_macro_arg'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 7,
                 'macro' => 'macro1'
@@ -182,12 +182,12 @@ $result_trees{'comma_value_in_macro_arg'} = {
               'text' => ' protected \\ -> \\arg1\\ '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 7,
                 'macro' => 'macro1'
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl 
b/tp/t/results/value_and_macro/macro_in_value.pl
index 78a2f29750..39db050512 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -106,7 +106,8 @@ $result_trees{'macro_in_value'} = {
                 {
                   'counter' => 1,
                   'element' => {
-                    'args' => [
+                    'cmdname' => 'value',
+                    'contents' => [
                       {
                         'contents' => [
                           {
@@ -115,8 +116,7 @@ $result_trees{'macro_in_value'} = {
                         ],
                         'type' => 'brace_container'
                       }
-                    ],
-                    'cmdname' => 'value'
+                    ]
                   },
                   'line' => '@ab',
                   'position' => 8,
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl 
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index a3b7edbf55..fcfbd5674a 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -122,7 +122,8 @@ $result_trees{'value_in_macro_body'} = {
               'text' => 'result: '
             },
             {
-              'args' => [
+              'cmdname' => 'emph',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -130,7 +131,8 @@ $result_trees{'value_in_macro_body'} = {
                         {
                           'counter' => 1,
                           'element' => {
-                            'args' => [
+                            'cmdname' => 'value',
+                            'contents' => [
                               {
                                 'contents' => [
                                   {
@@ -139,8 +141,7 @@ $result_trees{'value_in_macro_body'} = {
                                 ],
                                 'type' => 'brace_container'
                               }
-                            ],
-                            'cmdname' => 'value'
+                            ]
                           },
                           'line' => '\\arg\\',
                           'position' => 1,
@@ -160,7 +161,6 @@ $result_trees{'value_in_macro_body'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'emph',
               'source_info' => {
                 'line_nr' => 7,
                 'macro' => 'testvaluebody'
diff --git a/tp/t/results/verb/comments.pl b/tp/t/results/verb/comments.pl
index 4c3eb71f19..c90fdbac07 100644
--- a/tp/t/results/verb/comments.pl
+++ b/tp/t/results/verb/comments.pl
@@ -12,7 +12,8 @@ $result_trees{'comments'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -28,7 +29,6 @@ $result_trees{'comments'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => 'a'
               },
@@ -60,7 +60,8 @@ $result_trees{'comments'} = {
               'text' => 'something '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -71,7 +72,6 @@ $result_trees{'comments'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ','
               },
diff --git a/tp/t/results/verb/end_of_line.pl b/tp/t/results/verb/end_of_line.pl
index efeddcfab6..16f7cae4fe 100644
--- a/tp/t/results/verb/end_of_line.pl
+++ b/tp/t/results/verb/end_of_line.pl
@@ -15,7 +15,8 @@ $result_trees{'end_of_line'} = {
               'text' => 'verb at end of line '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -41,7 +42,6 @@ $result_trees{'end_of_line'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ''
               },
diff --git a/tp/t/results/verb/multiline.pl b/tp/t/results/verb/multiline.pl
index 8f762db0dd..23c830f418 100644
--- a/tp/t/results/verb/multiline.pl
+++ b/tp/t/results/verb/multiline.pl
@@ -12,7 +12,8 @@ $result_trees{'multiline'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -34,7 +35,6 @@ $result_trees{'multiline'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '@'
               },
diff --git a/tp/t/results/verb/nested.pl b/tp/t/results/verb/nested.pl
index ad943973a4..09bf32fdc5 100644
--- a/tp/t/results/verb/nested.pl
+++ b/tp/t/results/verb/nested.pl
@@ -12,14 +12,16 @@ $result_trees{'nested'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'b',
+              'contents' => [
                 {
                   'contents' => [
                     {
                       'text' => 'in b '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'verb',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -30,7 +32,6 @@ $result_trees{'nested'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'verb',
                       'info' => {
                         'delimiter' => '/'
                       },
@@ -45,7 +46,6 @@ $result_trees{'nested'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'b',
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/verb/simple.pl b/tp/t/results/verb/simple.pl
index a03f2ef3b0..2d2b589dd9 100644
--- a/tp/t/results/verb/simple.pl
+++ b/tp/t/results/verb/simple.pl
@@ -12,7 +12,8 @@ $result_trees{'simple'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'simple'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
diff --git a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl 
b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
index a057816c5a..bdb32a9a97 100644
--- a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
@@ -15,7 +15,8 @@ $result_trees{'verb_and_char_end_of_line_not_closed'} = {
               'text' => 'verb, not  closed '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -37,7 +38,6 @@ $result_trees{'verb_and_char_end_of_line_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '*'
               },
diff --git a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl 
b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
index b4ede63daf..6d1b171b4e 100644
--- a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
@@ -15,7 +15,8 @@ $result_trees{'verb_at_end_of_line_not_closed'} = {
               'text' => 'verb at end of line '
             },
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -32,7 +33,6 @@ $result_trees{'verb_at_end_of_line_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => ''
               },
diff --git a/tp/t/results/verb/verb_not_closed.pl 
b/tp/t/results/verb/verb_not_closed.pl
index 962bbdff23..a3916f8746 100644
--- a/tp/t/results/verb/verb_not_closed.pl
+++ b/tp/t/results/verb/verb_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'verb_not_closed'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -23,7 +24,6 @@ $result_trees{'verb_not_closed'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '.'
               },
diff --git a/tp/t/results/verb/verb_not_closed_with_char.pl 
b/tp/t/results/verb/verb_not_closed_with_char.pl
index 6f2bf219b1..bcbddc57ad 100644
--- a/tp/t/results/verb/verb_not_closed_with_char.pl
+++ b/tp/t/results/verb/verb_not_closed_with_char.pl
@@ -12,7 +12,8 @@ $result_trees{'verb_not_closed_with_char'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'verb',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -43,7 +44,6 @@ $result_trees{'verb_not_closed_with_char'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'verb',
               'info' => {
                 'delimiter' => '*'
               },
diff --git a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl 
b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
index 2266b88354..7d5b5d6a49 100644
--- a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
+++ b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
@@ -10,7 +10,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -26,7 +27,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -44,7 +44,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -60,7 +61,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -78,7 +78,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -102,7 +103,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -120,7 +120,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -144,7 +145,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -162,7 +162,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -186,7 +187,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -204,7 +204,8 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -228,7 +229,6 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index f43c7e8dde..8d2b2a84fe 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -325,7 +325,8 @@ $result_trees{'commands_and_spaces'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -390,7 +391,6 @@ $result_trees{'commands_and_spaces'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -408,7 +408,8 @@ $result_trees{'commands_and_spaces'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -479,7 +480,6 @@ $result_trees{'commands_and_spaces'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -614,7 +614,8 @@ $result_trees{'commands_and_spaces'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -629,7 +630,6 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
@@ -652,7 +652,8 @@ $result_trees{'commands_and_spaces'} = {
               'type' => 'paragraph'
             },
             {
-              'args' => [
+              'cmdname' => 'shortcaption',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -667,7 +668,6 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'shortcaption',
               'extra' => {
                 'float' => {}
               },
@@ -870,7 +870,8 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => '  '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'var',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -880,7 +881,6 @@ $result_trees{'commands_and_spaces'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'var',
                   'source_info' => {
                     'line_nr' => 39
                   }
@@ -1246,7 +1246,8 @@ $result_trees{'commands_and_spaces'} = {
               'text' => 'T'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1261,7 +1262,6 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -1290,7 +1290,8 @@ $result_trees{'commands_and_spaces'} = {
               'text' => 'Math '
             },
             {
-              'args' => [
+              'cmdname' => 'math',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1314,7 +1315,6 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'math',
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -1339,7 +1339,8 @@ $result_trees{'commands_and_spaces'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'indicateurl',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1349,7 +1350,6 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'brace_container'
                 }
               ],
-              'cmdname' => 'indicateurl',
               'source_info' => {
                 'line_nr' => 62
               }
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index ed0ed9cee7..014c951ac5 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -314,12 +314,12 @@ $result_trees{'comments_on_block_command_lines'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'bullet',
                   'source_info' => {
                     'line_nr' => 13
                   }
@@ -1037,7 +1037,8 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'text' => 'in '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'code',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -1047,7 +1048,6 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'code',
                   'source_info' => {
                     'line_nr' => 45
                   }
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 6f384d62d1..2ff80e5b20 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -10,7 +10,8 @@ $result_trees{'image_inline_or_not'} = {
     {
       'contents' => [
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -20,7 +21,6 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -43,7 +43,8 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'Para '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -53,7 +54,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -132,7 +132,8 @@ $result_trees{'image_inline_or_not'} = {
           'type' => 'empty_line'
         },
         {
-          'args' => [
+          'cmdname' => 'image',
+          'contents' => [
             {
               'contents' => [
                 {
@@ -142,7 +143,6 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'brace_arg'
             }
           ],
-          'cmdname' => 'image',
           'extra' => {
             'input_encoding_name' => 'utf-8'
           },
@@ -165,7 +165,8 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'Para '
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -175,7 +176,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -217,7 +217,8 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'empty_line'
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -227,7 +228,6 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -249,7 +249,8 @@ $result_trees{'image_inline_or_not'} = {
 '
                 },
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -259,7 +260,6 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -319,7 +319,8 @@ $result_trees{'image_inline_or_not'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'image',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -329,7 +330,6 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'brace_arg'
                     }
                   ],
-                  'cmdname' => 'image',
                   'extra' => {
                     'input_encoding_name' => 'utf-8'
                   },
@@ -350,7 +350,8 @@ $result_trees{'image_inline_or_not'} = {
           'cmdname' => 'quotation',
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -360,7 +361,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -448,7 +448,8 @@ $result_trees{'image_inline_or_not'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
+                              'cmdname' => 'image',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -458,7 +459,6 @@ $result_trees{'image_inline_or_not'} = {
                                   'type' => 'brace_arg'
                                 }
                               ],
-                              'cmdname' => 'image',
                               'extra' => {
                                 'input_encoding_name' => 'utf-8'
                               },
@@ -497,7 +497,8 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -507,7 +508,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -530,7 +530,8 @@ $result_trees{'image_inline_or_not'} = {
                           'text' => 'AA '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'image',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -540,7 +541,6 @@ $result_trees{'image_inline_or_not'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'image',
                           'extra' => {
                             'input_encoding_name' => 'utf-8'
                           },
@@ -561,7 +561,8 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'empty_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -571,7 +572,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -660,7 +660,8 @@ $result_trees{'image_inline_or_not'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -670,7 +671,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -698,7 +698,8 @@ $result_trees{'image_inline_or_not'} = {
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'cmdname' => 'image',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -708,7 +709,6 @@ $result_trees{'image_inline_or_not'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'image',
                           'extra' => {
                             'input_encoding_name' => 'utf-8'
                           },
@@ -741,7 +741,8 @@ $result_trees{'image_inline_or_not'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -751,7 +752,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -778,7 +778,8 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => ')'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -788,7 +789,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -846,7 +846,8 @@ $result_trees{'image_inline_or_not'} = {
                       'type' => 'after_menu_description_line'
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -856,7 +857,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -930,7 +930,8 @@ $result_trees{'image_inline_or_not'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -940,7 +941,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -977,7 +977,8 @@ $result_trees{'image_inline_or_not'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -987,7 +988,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -1023,11 +1023,13 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'T'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1037,7 +1039,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -1053,7 +1054,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -1083,7 +1083,8 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'U'
             },
             {
-              'args' => [
+              'cmdname' => 'footnote',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1093,7 +1094,8 @@ $result_trees{'image_inline_or_not'} = {
 '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'image',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1103,7 +1105,6 @@ $result_trees{'image_inline_or_not'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'image',
                           'extra' => {
                             'input_encoding_name' => 'utf-8'
                           },
@@ -1127,7 +1128,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'footnote',
               'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
@@ -1184,7 +1184,8 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'image',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -1194,7 +1195,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'image',
               'extra' => {
                 'input_encoding_name' => 'utf-8'
               },
@@ -1212,11 +1212,13 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'empty_line'
             },
             {
-              'args' => [
+              'cmdname' => 'caption',
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'image',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -1226,7 +1228,6 @@ $result_trees{'image_inline_or_not'} = {
                           'type' => 'brace_arg'
                         }
                       ],
-                      'cmdname' => 'image',
                       'extra' => {
                         'input_encoding_name' => 'utf-8'
                       },
@@ -1240,7 +1241,8 @@ $result_trees{'image_inline_or_not'} = {
                           'text' => ' PAra '
                         },
                         {
-                          'args' => [
+                          'cmdname' => 'image',
+                          'contents' => [
                             {
                               'contents' => [
                                 {
@@ -1250,7 +1252,6 @@ $result_trees{'image_inline_or_not'} = {
                               'type' => 'brace_arg'
                             }
                           ],
-                          'cmdname' => 'image',
                           'extra' => {
                             'input_encoding_name' => 'utf-8'
                           },
@@ -1265,7 +1266,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'brace_command_context'
                 }
               ],
-              'cmdname' => 'caption',
               'extra' => {
                 'float' => {}
               },
diff --git a/tp/t/results/xml_tests/inline_commands.pl 
b/tp/t/results/xml_tests/inline_commands.pl
index 2a06819d5c..a9e98df72d 100644
--- a/tp/t/results/xml_tests/inline_commands.pl
+++ b/tp/t/results/xml_tests/inline_commands.pl
@@ -12,7 +12,8 @@ $result_trees{'inline_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -35,7 +36,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'xml'
@@ -49,7 +49,8 @@ $result_trees{'inline_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineraw',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -68,7 +69,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineraw',
               'extra' => {
                 'format' => 'html'
               },
@@ -91,7 +91,8 @@ $result_trees{'inline_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -103,7 +104,8 @@ $result_trees{'inline_commands'} = {
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'cmdname' => 'env',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -113,7 +115,6 @@ $result_trees{'inline_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'env',
                       'source_info' => {
                         'line_nr' => 4
                       }
@@ -130,7 +131,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'xml'
@@ -144,7 +144,8 @@ $result_trees{'inline_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmt',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -163,7 +164,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmt',
               'extra' => {
                 'format' => 'html'
               },
@@ -186,7 +186,8 @@ $result_trees{'inline_commands'} = {
         {
           'contents' => [
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -201,7 +202,8 @@ $result_trees{'inline_commands'} = {
                       'text' => 'xml '
                     },
                     {
-                      'args' => [
+                      'cmdname' => 'code',
+                      'contents' => [
                         {
                           'contents' => [
                             {
@@ -211,7 +213,6 @@ $result_trees{'inline_commands'} = {
                           'type' => 'brace_container'
                         }
                       ],
-                      'cmdname' => 'code',
                       'source_info' => {
                         'line_nr' => 7
                       }
@@ -234,7 +235,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 1,
                 'format' => 'xml'
@@ -248,7 +248,8 @@ $result_trees{'inline_commands'} = {
 '
             },
             {
-              'args' => [
+              'cmdname' => 'inlinefmtifelse',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -280,7 +281,6 @@ $result_trees{'inline_commands'} = {
                   'type' => 'brace_arg'
                 }
               ],
-              'cmdname' => 'inlinefmtifelse',
               'extra' => {
                 'expand_index' => 2,
                 'format' => 'html'
diff --git a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl 
b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
index 684009dc12..2d9abbc16b 100644
--- a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
+++ b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
@@ -15,7 +15,8 @@ $result_trees{'inlineifset_empty_second_arg'} = {
               'text' => 'Toto '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -34,7 +35,6 @@ $result_trees{'inlineifset_empty_second_arg'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'flag'
               },
@@ -60,7 +60,8 @@ $result_trees{'inlineifset_empty_second_arg'} = {
               'text' => 'Again with space '
             },
             {
-              'args' => [
+              'cmdname' => 'inlineifset',
+              'contents' => [
                 {
                   'contents' => [
                     {
@@ -79,7 +80,6 @@ $result_trees{'inlineifset_empty_second_arg'} = {
                   'type' => 'elided_brace_command_arg'
                 }
               ],
-              'cmdname' => 'inlineifset',
               'extra' => {
                 'format' => 'flag'
               },
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 51cd8de2f8..c05ca376ee 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -86,7 +86,8 @@ $result_trees{'accent_on_table_line'} = {
                               'text' => 'no at-command '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -96,7 +97,6 @@ $result_trees{'accent_on_table_line'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 3
                               }
@@ -186,12 +186,12 @@ $result_trees{'accent_on_table_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => '~',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => '~',
                   'source_info' => {
                     'line_nr' => 6
                   }
@@ -257,7 +257,8 @@ $result_trees{'accent_on_table_line'} = {
                               'text' => 'no at-command '
                             },
                             {
-                              'args' => [
+                              'cmdname' => 'code',
+                              'contents' => [
                                 {
                                   'contents' => [
                                     {
@@ -267,7 +268,6 @@ $result_trees{'accent_on_table_line'} = {
                                   'type' => 'brace_container'
                                 }
                               ],
-                              'cmdname' => 'code',
                               'source_info' => {
                                 'line_nr' => 8
                               }
@@ -702,12 +702,12 @@ $result_trees{'accent_on_table_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'source_info' => {
                     'line_nr' => 23
                   }
@@ -820,7 +820,8 @@ $result_trees{'accent_on_table_line'} = {
             {
               'contents' => [
                 {
-                  'args' => [
+                  'cmdname' => 'ringaccent',
+                  'contents' => [
                     {
                       'contents' => [
                         {
@@ -830,7 +831,6 @@ $result_trees{'accent_on_table_line'} = {
                       'type' => 'brace_container'
                     }
                   ],
-                  'cmdname' => 'ringaccent',
                   'source_info' => {
                     'line_nr' => 27
                   }



reply via email to

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