texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: rename argument type as arguments_line


From: Patrice Dumas
Subject: branch master updated: rename argument type as arguments_line
Date: Tue, 24 Dec 2024 11:03:59 -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 cc1430314f rename argument type as arguments_line
cc1430314f is described below

commit cc1430314f344dedbdb78775e9d9827c56b21bfb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 24 17:03:45 2024 +0100

    rename argument type as arguments_line
    
    * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
    (_handle_line_command, _handle_block_command),
    tp/Texinfo/Structuring.pm (new_block_command),
    tp/Texinfo/Transformations.pm (_new_node),
    tp/Texinfo/XS/main/element_types.txt,
    tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command)
    (handle_block_command), tp/Texinfo/XS/parsetexi/macro.c
    (parse_macro_command_line),
    tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command),
    tp/Texinfo/XS/structuring_transfo/transformations.c
    (fill_gaps_in_sectioning, new_node): rename argument type as
    arguments_line.  Update users.
---
 ChangeLog                                          |  17 +++
 tp/Texinfo/Common.pm                               |   2 +-
 tp/Texinfo/Convert/Converter.pm                    |   2 +-
 tp/Texinfo/Convert/DocBook.pm                      |   4 +-
 tp/Texinfo/Convert/HTML.pm                         |   4 +-
 tp/Texinfo/Convert/LaTeX.pm                        |   2 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   4 +-
 tp/Texinfo/Convert/Texinfo.pm                      |   5 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |   8 +-
 tp/Texinfo/Convert/Text.pm                         |   2 +-
 tp/Texinfo/Convert/TextContent.pm                  |   2 +-
 tp/Texinfo/ParserNonXS.pm                          |  46 +++---
 tp/Texinfo/Structuring.pm                          |  11 +-
 tp/Texinfo/Transformations.pm                      |  12 +-
 tp/Texinfo/XS/convert/convert_html.c               |   2 +-
 tp/Texinfo/XS/convert/html_prepare_converter.c     |   2 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |  10 +-
 tp/Texinfo/XS/main/convert_to_text.c               |   2 +-
 tp/Texinfo/XS/main/element_types.c                 |   4 +-
 tp/Texinfo/XS/main/element_types.h                 |   4 +-
 tp/Texinfo/XS/main/element_types.txt               |   5 +-
 tp/Texinfo/XS/main/utils.c                         |   2 +-
 tp/Texinfo/XS/parsetexi/def.c                      |   4 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |   4 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |  12 +-
 tp/Texinfo/XS/parsetexi/macro.c                    |   8 +-
 tp/Texinfo/XS/parsetexi/parser.c                   |   2 +-
 tp/Texinfo/XS/parsetexi/separator.c                |   2 +-
 tp/Texinfo/XS/structuring_transfo/structuring.c    |  10 +-
 .../XS/structuring_transfo/transformations.c       |  14 +-
 tp/ext/latex2html.pm                               |   2 +-
 tp/ext/tex4ht.pm                                   |   2 +-
 tp/t/01use.t                                       |   2 +-
 tp/t/results/alias/alias_macro_target_removed.pl   |   2 +-
 tp/t/results/alias/alias_of_added_index.pl         |   8 +-
 .../alias_of_added_index_before_added_index.pl     |   8 +-
 tp/t/results/alias/alias_of_macro.pl               |   2 +-
 tp/t/results/alias/alias_of_macro_before_macro.pl  |   2 +-
 tp/t/results/alias/alias_table_command.pl          |   2 +-
 tp/t/results/alias/block_command_alias.pl          |   2 +-
 tp/t/results/alias/texinfo_command_alias.pl        |   2 +-
 .../alias/texinfo_command_alias_indirect.pl        |   2 +-
 .../alias/texinfo_command_alias_indirect_before.pl |   2 +-
 tp/t/results/columnfractions/empty.pl              |   2 +-
 tp/t/results/columnfractions/empty_comment.pl      |   2 +-
 tp/t/results/columnfractions/good.pl               |   2 +-
 tp/t/results/columnfractions/good_comment.pl       |   2 +-
 tp/t/results/columnfractions/good_space_comment.pl |   2 +-
 tp/t/results/columnfractions/invalid.pl            |   2 +-
 tp/t/results/columnfractions/not_fraction.pl       |   2 +-
 .../something_before_columnfractions.pl            |   2 +-
 tp/t/results/columnfractions/wrong_command.pl      |   2 +-
 .../additional_space_in_end_conditional.pl         |   2 +-
 ...additional_space_in_end_conditional_expanded.pl |   2 +-
 tp/t/results/conditionals/bad_ifclear_argument.pl  |   2 +-
 tp/t/results/conditionals/bad_ifset_argument.pl    |   2 +-
 tp/t/results/conditionals/command_conditionals.pl  |  14 +-
 .../command_conditionals_user_defined.pl           |  18 +--
 tp/t/results/conditionals/commands_in_ifset.pl     |   4 +-
 tp/t/results/conditionals/comment_on_ifset_line.pl |  12 +-
 tp/t/results/conditionals/cond.pl                  |  22 +--
 tp/t/results/conditionals/cond_ifhtml_ifinfo.pl    |  22 +--
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |  22 +--
 tp/t/results/conditionals/cond_info.pl             |  22 +--
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |  22 +--
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |  22 +--
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |  22 +--
 tp/t/results/conditionals/cond_xml.pl              |  22 +--
 .../results/conditionals/conditional_not_closed.pl |   2 +-
 .../conditionals/consecutive_conditionals.pl       |   8 +-
 tp/t/results/conditionals/defcondx_Dbar.pl         |   4 +-
 tp/t/results/conditionals/defcondx_Ubar.pl         |   4 +-
 tp/t/results/conditionals/empty_ifclear.pl         |   2 +-
 tp/t/results/conditionals/empty_ifset.pl           |   2 +-
 .../conditionals/empty_ifset_in_ifset_no_set.pl    |   2 +-
 .../conditionals/empty_ifset_in_ifset_set.pl       |   4 +-
 tp/t/results/conditionals/empty_set_in_ifclear.pl  |   2 +-
 tp/t/results/conditionals/empty_set_in_ifset.pl    |   2 +-
 .../end_conditional_not_at_line_begining.pl        |   2 +-
 tp/t/results/conditionals/end_ifset_in_format.pl   |  10 +-
 .../conditionals/false_format_not_closed.pl        |   2 +-
 tp/t/results/conditionals/if_not_closed.pl         |   2 +-
 tp/t/results/conditionals/ifclear_in_ifset.pl      |   2 +-
 tp/t/results/conditionals/ifclear_in_ifset_set.pl  |   4 +-
 .../conditionals/ifnot_format_conditional.pl       |   2 +-
 tp/t/results/conditionals/ifnotinfo_exception.pl   |   2 +-
 tp/t/results/conditionals/ifset_in_command.pl      |   4 +-
 tp/t/results/conditionals/ifset_nonalpha.pl        |   2 +-
 tp/t/results/conditionals/ignore_not_closed.pl     |   2 +-
 .../conditionals/ignore_spaces_and_comments.pl     |  10 +-
 tp/t/results/conditionals/ignored_in_ifset.pl      |   6 +-
 .../conditionals/info_ifinfo_ifnotplaintext.pl     |   4 +-
 tp/t/results/conditionals/info_ifplaintext.pl      |   2 +-
 tp/t/results/conditionals/macro_in_ifset.pl        |   4 +-
 tp/t/results/conditionals/macro_in_ifset_set.pl    |   6 +-
 tp/t/results/conditionals/many_conditionals.pl     |  16 +--
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |  18 +--
 .../nested_ifset_prepended_to_command_name.pl      |   2 +-
 tp/t/results/conditionals/nested_ignore.pl         |   2 +-
 .../conditionals/nested_ignore_comment_no_eol.pl   |   2 +-
 .../conditionals/nested_ignore_with_comments.pl    |   2 +-
 tp/t/results/conditionals/not_set.pl               |   2 +-
 tp/t/results/conditionals/plaintext_ifinfo.pl      |   2 +-
 .../plaintext_ifinfo_ifnotplaintext.pl             |   4 +-
 .../conditionals/superfluous_argument_to_end.pl    |   2 +-
 .../conditionals/text_on_conditional_line.pl       |   2 +-
 .../text_on_conditional_line_expanded.pl           |   2 +-
 .../conditionals/user_defined_txiinternalvalue.pl  |   2 +-
 tp/t/results/conditionals/value_on_ifset.pl        |   4 +-
 .../results/converters_tests/at_commands_in_raw.pl |  14 +-
 tp/t/results/converters_tests/combined_fonts.pl    |  10 +-
 tp/t/results/converters_tests/commands_in_sc.pl    |   8 +-
 .../commands_in_settitle_with_title.pl             |   8 +-
 tp/t/results/converters_tests/commands_in_var.pl   |   8 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  12 +-
 .../converters_tests/contents_at_document_begin.pl |  10 +-
 .../contents_at_document_begin_inline.pl           |  10 +-
 .../contents_at_document_begin_separate_element.pl |  10 +-
 .../conversion_with_undef_customization.pl         |  12 +-
 .../converters_tests/definition_commands.pl        |  10 +-
 .../email_table_command_as_argument.pl             |   2 +-
 .../converters_tests/enumerate_above_ten.pl        |   2 +-
 tp/t/results/converters_tests/extension_undef.pl   |   6 +-
 .../results/converters_tests/footnote_no_number.pl |   8 +-
 .../footnote_no_number_separate.pl                 |   8 +-
 tp/t/results/converters_tests/form_feeds.pl        |  10 +-
 .../converters_tests/frenchspacing_and_code.pl     |  16 +--
 tp/t/results/converters_tests/image_formatting.pl  |  10 +-
 .../index_entry_in_preformatted.pl                 |  10 +-
 .../indices_in_begin_tables_lists.pl               |  52 +++----
 ...ces_in_begin_tables_lists_entries_after_item.pl |  52 +++----
 tp/t/results/converters_tests/line_breaks.pl       |   6 +-
 tp/t/results/converters_tests/link.pl              |   6 +-
 .../converters_tests/multitable_prototypes.pl      |   2 +-
 tp/t/results/converters_tests/non_empty_part.pl    |  32 ++---
 .../non_empty_part_no_top_node_output.pl           |  32 ++---
 .../converters_tests/normal_font_in_monospace.pl   |   2 +-
 .../printindex_merged_indices_code_style.pl        |   8 +-
 .../results/converters_tests/raw_block_commands.pl |  10 +-
 .../raw_block_commands_expand_tex.pl               |  10 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  40 +++---
 .../reference_for_formatting_customizations.pl     |   8 +-
 .../references_to_top_no_top_output.pl             |  14 +-
 tp/t/results/converters_tests/refs_formatting.pl   |   4 +-
 .../converters_tests/sections_and_printindex.pl    |  14 +-
 .../converters_tests/setfilename_no_extension.pl   |   6 +-
 .../converters_tests/simplest_test_prefix.pl       |   2 +-
 .../some_at_commands_in_ref_nodes.pl               |  10 +-
 tp/t/results/converters_tests/sp_in_example.pl     |   2 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  10 +-
 .../converters_tests/spaces_in_node_names.pl       |  10 +-
 .../table_in_display_in_example.pl                 |   6 +-
 .../table_in_example_in_display.pl                 |   6 +-
 .../converters_tests/test_deftypefnnewline.pl      |   8 +-
 .../test_formatting_customizations.pl              |   8 +-
 .../converters_tests/things_before_setfilename.pl  |  14 +-
 .../things_before_setfilename_no_element.pl        |   6 +-
 tp/t/results/converters_tests/top_in_ref.pl        |   4 +-
 .../various_itemize_command_as_argument.pl         |  22 +--
 .../various_vtable_command_as_argument.pl          |  26 ++--
 tp/t/results/coverage/block_commands.pl            |   6 +-
 tp/t/results/coverage/bye_on_end_command_line.pl   |   2 +-
 tp/t/results/coverage/cartouche.pl                 |   4 +-
 tp/t/results/coverage/cartouche_in_example.pl      |   4 +-
 tp/t/results/coverage/cartouche_in_quotation.pl    |   4 +-
 .../coverage/cartouche_title_and_content.pl        |   2 +-
 tp/t/results/coverage/command_in_end.pl            |  16 +--
 .../command_in_end_expanded_raw_command_after.pl   |   2 +-
 ...mand_in_end_expanded_raw_command_empty_after.pl |   2 +-
 .../command_in_end_expanded_raw_in_command.pl      |   2 +-
 ..._in_end_expanded_raw_one_char_before_command.pl |   2 +-
 ..._in_end_expanded_raw_one_char_not_in_command.pl |   2 +-
 ..._in_end_expanded_raw_two_char_before_command.pl |   2 +-
 ..._in_end_expanded_raw_two_char_not_in_command.pl |   2 +-
 .../command_in_end_ignored_raw_command_after.pl    |   2 +-
 .../command_in_end_ignored_raw_in_command.pl       |   2 +-
 ...d_in_end_ignored_raw_one_char_before_command.pl |   2 +-
 ...d_in_end_ignored_raw_one_char_not_in_command.pl |   2 +-
 ...d_in_end_ignored_raw_two_char_before_command.pl |   2 +-
 ...d_in_end_ignored_raw_two_char_not_in_command.pl |   2 +-
 tp/t/results/coverage/commands_in_math.pl          |   8 +-
 tp/t/results/coverage/comment_on_cartouche_line.pl |   4 +-
 tp/t/results/coverage/comment_on_group_line.pl     |   2 +-
 tp/t/results/coverage/displaymath.pl               |   8 +-
 .../end_bad_end_argument_and_superfluous_arg.pl    |   2 +-
 tp/t/results/coverage/exdent_and_commands.pl       |   4 +-
 tp/t/results/coverage/exdent_and_formats.pl        |  28 ++--
 tp/t/results/coverage/flushleft_flushright.pl      |   4 +-
 .../coverage/flushleft_flushright_in_quotation.pl  |   6 +-
 tp/t/results/coverage/flushright_example_nested.pl |   8 +-
 tp/t/results/coverage/flushright_not_closed.pl     |   2 +-
 .../coverage/formats_only_title_comments.pl        |  10 +-
 tp/t/results/coverage/formats_only_titles.pl       |  10 +-
 tp/t/results/coverage/formats_titles.pl            |  10 +-
 .../coverage/group_beginning_and_end_on_line.pl    |   2 +-
 tp/t/results/coverage/group_not_closed.pl          |   2 +-
 tp/t/results/coverage/indentedblock.pl             |   2 +-
 tp/t/results/coverage/insertcopying.pl             |   4 +-
 tp/t/results/coverage/item_container.pl            |   6 +-
 tp/t/results/coverage/multitable.pl                |   4 +-
 tp/t/results/coverage/nested_block_commands.pl     |  48 +++----
 tp/t/results/coverage/preformatted.pl              |   6 +-
 .../coverage/punctuation_in_line_commands.pl       |  12 +-
 tp/t/results/coverage/quotation_author.pl          |   2 +-
 tp/t/results/coverage/raggedright.pl               |   2 +-
 tp/t/results/coverage/symbol_after_block.pl        |  28 ++--
 tp/t/results/coverage/symbol_after_command.pl      |   2 +-
 tp/t/results/coverage/table.pl                     |   6 +-
 tp/t/results/coverage/table_command_comment.pl     |   2 +-
 tp/t/results/coverage_braces/caption_not_closed.pl |   2 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   8 +-
 .../definfoenclose_texinfo_commands.pl             |   2 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |   2 +-
 .../format_on_first_footnote_line.pl               |   4 +-
 .../coverage_braces/inforef_too_much_args.pl       |   2 +-
 tp/t/results/coverage_braces/kbd.pl                |   4 +-
 tp/t/results/coverage_braces/seeentry_no_braces.pl |   8 +-
 tp/t/results/coverage_braces/test_image.pl         |  12 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  10 +-
 .../two_footnotes_in_nodes_separate.pl             |  10 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |  10 +-
 tp/t/results/def/adjacent_defline.pl               |   2 +-
 .../def/all_commands_delimiters_printindex.pl      |   4 +-
 tp/t/results/def/all_commands_printindex.pl        |   4 +-
 tp/t/results/def/comment_index_before_defline.pl   |   2 +-
 tp/t/results/def/defblock_no_defline.pl            |   2 +-
 tp/t/results/def/defline_no_params.pl              |   2 +-
 tp/t/results/def/deftypeline.pl                    |   2 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   2 +-
 .../def/defx_after_empty_line_in_example.pl        |   2 +-
 .../def/defx_after_preformatted_with_text.pl       |   2 +-
 tp/t/results/def/defx_in_example.pl                |   2 +-
 .../def/inter_item_commands_in_def_in_example.pl   |   2 +-
 tp/t/results/def/multiple_defline.pl               |   2 +-
 tp/t/results/def/omit_def_space.pl                 |   4 +-
 tp/t/results/def/ref_in_def.pl                     |   2 +-
 tp/t/results/def/space_in_def_for_index.pl         |   4 +-
 tp/t/results/def/text_block_before_defline.pl      |  14 +-
 .../docbook_tests/between_node_and_section.pl      |  12 +-
 ...pty_quotation_with_arg_followed_by_quotation.pl |   4 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  20 +--
 .../docbook_tests/special_docbook_unnumbered.pl    |  22 +--
 tp/t/results/epub_tests/chapter_before_top_epub.pl |  10 +-
 tp/t/results/epub_tests/section_part_epub.pl       |   6 +-
 .../setfilename_on_top_and_after_node_epub.pl      |   4 +-
 tp/t/results/float/anchor_in_caption.pl            |   6 +-
 tp/t/results/float/cindex_in_caption.pl            |   6 +-
 .../results/float/comment_space_comand_in_float.pl |   6 +-
 tp/t/results/float/complex_float.pl                |  36 ++---
 tp/t/results/float/empty_caption.pl                |   6 +-
 tp/t/results/float/empty_label_no_space.pl         |   2 +-
 tp/t/results/float/empty_label_no_space_comment.pl |   2 +-
 tp/t/results/float/empty_label_with_space.pl       |   2 +-
 .../float/empty_label_with_space_comment.pl        |   2 +-
 .../float/empty_listoffloats_with_floats.pl        |   8 +-
 tp/t/results/float/float_copying.pl                |  14 +-
 tp/t/results/float/float_in_block_commands.pl      |  12 +-
 tp/t/results/float/float_type_with_tieaccent.pl    |   2 +-
 tp/t/results/float/float_with_at_commands.pl       |   2 +-
 tp/t/results/float/footnote_in_caption.pl          |   6 +-
 .../results/float/footnote_in_caption_and_error.pl |   6 +-
 .../results/float/multiple_spaces_in_float_type.pl |   2 +-
 .../float/numbering_captions_listoffloats.pl       |  86 ++++++------
 tp/t/results/float/ref_to_float.pl                 |   4 +-
 tp/t/results/float/simple.pl                       |   2 +-
 .../float/special_characters_in_float_type.pl      |  10 +-
 tp/t/results/formats_encodings/accent.pl           |   4 +-
 .../formats_encodings/accent_argument_non_ascii.pl |   8 +-
 .../formats_encodings/accent_enable_encoding.pl    |   4 +-
 tp/t/results/formats_encodings/accentenc.pl        |   4 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   4 +-
 .../formats_encodings/at_commands_in_refs.pl       | 124 ++++++++---------
 .../at_commands_in_refs_latin1.pl                  | 124 ++++++++---------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 124 ++++++++---------
 .../char_latin1_latin1_in_refs.pl                  |  26 ++--
 .../char_latin2_latin2_in_refs.pl                  |  10 +-
 .../char_us_ascii_latin1_in_refs.pl                |  26 ++--
 .../formats_encodings/char_utf8_latin1_in_refs.pl  |  26 ++--
 .../documentencoding_utf8_and_insertions.pl        |   2 +-
 .../dotless_argument_non_ascii.pl                  |   8 +-
 .../formats_encodings/japanese_shift_jis.pl        |  16 +--
 .../manual_simple_latin1_with_error.pl             |  10 +-
 .../manual_simple_utf8_with_error.pl               |  10 +-
 .../multiple_include_encodings.pl                  |  38 ++---
 .../no_documentencoding_and_insertions.pl          |   2 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  26 ++--
 .../formats_encodings/verb_delimiter_not_ascii.pl  |   8 +-
 tp/t/results/formats_encodings/weird_accents.pl    |   8 +-
 .../weird_accents_disable_encoding.pl              |   8 +-
 tp/t/results/heading/heading_in_copying.pl         |   6 +-
 tp/t/results/heading/heading_in_example.pl         |   2 +-
 tp/t/results/heading/heading_in_quotation.pl       |   2 +-
 tp/t/results/html_tests/U_in_index.pl              |   8 +-
 .../html_tests/acronym_in_node_and_section.pl      |  16 +--
 tp/t/results/html_tests/anchor_on_vtable_item.pl   |  14 +-
 tp/t/results/html_tests/automatic_menus.pl         |  16 +--
 .../html_tests/base_for_css_info_in_init_test.pl   |   4 +-
 .../character_number_leading_toc_stoc.pl           |   8 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  12 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |  12 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |  12 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |  12 +-
 .../html_tests/command_in_node_redirection.pl      |   4 +-
 .../command_in_node_redirection_multiple.pl        |   4 +-
 .../command_in_node_redirection_other_command.pl   |   4 +-
 .../command_in_node_redirection_same_command.pl    |   4 +-
 .../command_in_node_redirection_two_commands.pl    |   4 +-
 tp/t/results/html_tests/commands_in_abbr.pl        |   2 +-
 tp/t/results/html_tests/commands_in_alt.pl         |   2 +-
 tp/t/results/html_tests/contents_at_end.pl         |  10 +-
 tp/t/results/html_tests/contents_at_end_inline.pl  |  10 +-
 .../html_tests/contents_at_end_separate_element.pl |  10 +-
 .../html_tests/contents_in_middle_chapter.pl       |  16 +--
 .../contents_in_middle_chapter_inline.pl           |  16 +--
 .../contents_in_middle_chapter_separate_element.pl |  16 +--
 .../html_tests/contents_in_middle_section.pl       |  20 +--
 .../contents_in_middle_section_inline.pl           |  20 +--
 .../contents_in_middle_section_separate_element.pl |  20 +--
 .../html_tests/contents_with_only_top_node.pl      |   2 +-
 .../html_tests/css_in_node_redirection_page.pl     |   4 +-
 .../deftypefnnewline_for_copying_after.pl          |  10 +-
 .../deftypefnnewline_for_copying_before.pl         |  10 +-
 tp/t/results/html_tests/documentdescription.pl     |   4 +-
 tp/t/results/html_tests/double_contents.pl         |  16 +--
 .../html_tests/double_contents_after_title.pl      |  16 +--
 .../double_contents_after_title_show_title.pl      |  16 +--
 ...double_contents_after_title_show_title_nodes.pl |  16 +--
 tp/t/results/html_tests/double_contents_book.pl    |  16 +--
 tp/t/results/html_tests/double_contents_chapter.pl |  16 +--
 tp/t/results/html_tests/double_contents_inline.pl  |  16 +--
 .../html_tests/double_contents_inline_chapter.pl   |  16 +--
 .../html_tests/double_contents_inline_nodes.pl     |  16 +--
 .../html_tests/double_contents_inline_section.pl   |  16 +--
 tp/t/results/html_tests/double_contents_nodes.pl   |  16 +--
 tp/t/results/html_tests/double_contents_section.pl |  16 +--
 .../html_tests/double_contents_separate_element.pl |  16 +--
 .../double_contents_separate_element_chapter.pl    |  16 +--
 .../double_contents_separate_element_nodes.pl      |  16 +--
 .../double_contents_separate_element_section.pl    |  16 +--
 ...sive_self_section_reference_node_no_use_node.pl |   8 +-
 .../html_tests/empty_chapter_in_html_title.pl      |   8 +-
 ...y_chapter_in_html_title_no_node_no_use_nodes.pl |   6 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   4 +-
 .../empty_node_in_html_title_no_sec_name.pl        |   8 +-
 .../file_name_case_insensitive_conflict_node.pl    |  20 +--
 ...se_insensitive_conflict_node_no_redirections.pl |  20 +--
 ..._name_case_insensitive_conflict_redirections.pl |   8 +-
 .../html_tests/file_name_conflict_with_Top.pl      |   8 +-
 .../html_tests/file_name_conflict_with_section.pl  |   6 +-
 .../file_name_conflict_with_user_defined.pl        |  12 +-
 .../html_tests/filenameconflictwithnonsplit.pl     |   4 +-
 .../filenameconflictwithspecialelement.pl          |   8 +-
 tp/t/results/html_tests/float_copying.pl           |  14 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |   8 +-
 .../html_tests/footnotestyle_separate_late.pl      |  12 +-
 tp/t/results/html_tests/fractions_rounding.pl      |   2 +-
 .../html_tests/headings_after_lone_nodes.pl        |  36 ++---
 tp/t/results/html_tests/html_in_copying.pl         |   8 +-
 .../results/html_tests/index_and_node_same_name.pl |   4 +-
 tp/t/results/html_tests/index_below.pl             |   6 +-
 tp/t/results/html_tests/info_js_dir_html.pl        |   8 +-
 tp/t/results/html_tests/info_js_dir_html_file.pl   |   8 +-
 ...nfo_js_dir_html_file_js_weblabels_file_undef.pl |   8 +-
 tp/t/results/html_tests/info_js_dir_html_text.pl   |   8 +-
 tp/t/results/html_tests/inline_in_node.pl          |   8 +-
 tp/t/results/html_tests/itemize_arguments.pl       |  72 +++++-----
 .../itemize_arguments_enable_encoding.pl           |  72 +++++-----
 tp/t/results/html_tests/itemize_tieaccent.pl       |  12 +-
 tp/t/results/html_tests/letter_command_in_index.pl |   8 +-
 tp/t/results/html_tests/mathjax_with_texinfo.pl    |   2 +-
 .../mathjax_with_texinfo_enable_encoding.pl        |   2 +-
 .../html_tests/mathjax_with_texinfo_html_file.pl   |   2 +-
 .../html_tests/mathjax_with_texinfo_html_text.pl   |   2 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   2 +-
 tp/t/results/html_tests/menu.pl                    |  28 ++--
 .../html_tests/menu_in_documentdescription.pl      |   8 +-
 tp/t/results/html_tests/menu_in_example.pl         |  10 +-
 tp/t/results/html_tests/no_content.pl              |  10 +-
 tp/t/results/html_tests/no_content_do_contents.pl  |  10 +-
 .../html_tests/no_content_do_contents_inline.pl    |  10 +-
 .../no_content_do_contents_separate_element.pl     |  10 +-
 tp/t/results/html_tests/no_content_inline.pl       |  10 +-
 .../html_tests/no_content_separate_element.pl      |  10 +-
 tp/t/results/html_tests/node_footnote_end.pl       |  16 +--
 tp/t/results/html_tests/node_footnote_separated.pl |  16 +--
 tp/t/results/html_tests/node_footnote_use_node.pl  |  16 +--
 .../html_tests/node_footnote_use_node_separate.pl  |  16 +--
 .../html_tests/nodedescription_description.pl      |  20 +--
 .../nodedescription_description_no_use_nodes.pl    |  20 +--
 tp/t/results/html_tests/raw_html.pl                |   2 +-
 tp/t/results/html_tests/redirection_same_labels.pl |  24 ++--
 tp/t/results/html_tests/ref_in_preformatted.pl     |   8 +-
 .../html_tests/sectioning_check_menu_structure.pl  |  60 ++++----
 .../html_tests/set_unit_file_name_filepath.pl      |   8 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |   6 +-
 tp/t/results/html_tests/shorttitlepage.pl          |   4 +-
 .../html_tests/simple_only_special_spaces_node.pl  |  16 +--
 .../html_tests/simplest_test_date_in_header.pl     |   2 +-
 tp/t/results/html_tests/split_html_text.pl         |   8 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |   8 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |   8 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |   8 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |   8 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |   8 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |   8 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |   8 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |   8 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |   8 +-
 .../test_accents_sc_use_numeric_entity.pl          |   8 +-
 .../test_separated_contents_shortcontents.pl       |  12 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  10 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  10 +-
 .../tex_expanded_in_caption_multiple_time.pl       |   4 +-
 tp/t/results/html_tests/tex_expanded_in_copying.pl |   4 +-
 .../text_before_top_and_contents_after_title.pl    |   6 +-
 ...t_before_top_and_summarycontents_after_title.pl |   6 +-
 tp/t/results/html_tests/text_css_info_in_init.pl   |   4 +-
 tp/t/results/html_tests/titles.pl                  |   4 +-
 .../top_file_name_and_node_name_collision.pl       |  10 +-
 tp/t/results/html_tests/top_node_top_contents.pl   |   4 +-
 tp/t/results/html_tests/top_node_up_explicit.pl    |  10 +-
 .../html_tests/top_node_up_explicit_no_nodes.pl    |  10 +-
 tp/t/results/html_tests/top_node_up_implicit.pl    |  10 +-
 .../html_tests/top_node_up_implicit_no_nodes.pl    |  10 +-
 .../html_tests/transliterated_names_conflicts.pl   |  14 +-
 .../results/html_tests/undef_split_and_big_rule.pl |  10 +-
 .../verbatim_in_multitable_in_example.pl           |   6 +-
 .../xhtml_rule_element_already_closed.pl           |   8 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl   |   2 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  46 +++---
 .../htmlxref/htmlxref_no_urlprefix_first.pl        |   8 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  46 +++---
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  46 +++---
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  46 +++---
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  46 +++---
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  46 +++---
 tp/t/results/include/cpp_line_latin1.pl            |   6 +-
 tp/t/results/include/cpp_lines.pl                  |  10 +-
 .../include/include_in_removed_before_item.pl      |   2 +-
 .../include_with_setfilename_in_preformatted.pl    |   2 +-
 .../macro_and_commands_in_early_commands.pl        |  14 +-
 .../results/include/macro_definition_in_include.pl |   2 +-
 tp/t/results/include/macro_in_early_commands.pl    |  18 +--
 tp/t/results/include/value_expansion_in_include.pl |   4 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   4 +-
 tp/t/results/indices/def_syn_indices.pl            |   8 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl | Bin 10365 -> 10377 bytes
 tp/t/results/indices/double_index_entry.pl         |   6 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   8 +-
 tp/t/results/indices/double_syncodeindex.pl        |   4 +-
 tp/t/results/indices/empty_added_index_entry.pl    |   4 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   4 +-
 tp/t/results/indices/empty_index_entry.pl          |   4 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   6 +-
 tp/t/results/indices/encoding_index_ascii.pl       |   6 +-
 .../encoding_index_ascii_enable_encoding.pl        |   6 +-
 tp/t/results/indices/encoding_index_latin1.pl      |   6 +-
 .../encoding_index_latin1_enable_encoding.pl       |   6 +-
 tp/t/results/indices/encoding_index_utf8.pl        |   6 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |   6 +-
 .../indices/encoding_index_utf8_no_use_unicode.pl  |   6 +-
 tp/t/results/indices/explicit_sort_key.pl          |   6 +-
 tp/t/results/indices/ftable_vtable.pl              |   8 +-
 .../indices/ignored_sort_char_empty_entries.pl     |   6 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 5776 -> 5782 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 6179 -> 6185 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   8 +-
 tp/t/results/indices/index_entries_before_nodes.pl | Bin 11755 -> 11767 bytes
 tp/t/results/indices/index_entries_locations.pl    |   4 +-
 .../indices/index_entry_before_first_node.pl       | Bin 6262 -> 6268 bytes
 tp/t/results/indices/index_entry_before_node.pl    |   8 +-
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 7152 -> 7158 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   8 +-
 .../indices/index_entry_in_footnote_sections.pl    |   8 +-
 .../index_entry_in_footnote_sections_separate.pl   |   8 +-
 .../indices/index_entry_in_footnote_separate.pl    |   8 +-
 tp/t/results/indices/index_no_node.pl              |  10 +-
 tp/t/results/indices/index_no_node_no_top.pl       |  10 +-
 .../indices/index_no_node_no_top_no_node.pl        |  10 +-
 tp/t/results/indices/index_nodes.pl                |  16 +--
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  16 +--
 tp/t/results/indices/index_special_region.pl       |  18 +--
 .../index_special_region_no_insertcopying.pl       |  18 +--
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  18 +--
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  18 +--
 ...copying_titlepage_no_nodes_footnotes_default.pl |  18 +--
 .../index_special_region_no_titlepage_no_nodes.pl  |  18 +--
 .../index_special_region_titlepage_no_nodes.pl     |  18 +--
 ..._region_titlepage_no_nodes_footnotes_default.pl |  18 +--
 tp/t/results/indices/index_split.pl                |  44 +++---
 .../indices/index_split_split_chapter_no_nodes.pl  |  44 +++---
 tp/t/results/indices/index_table.pl                |  28 ++--
 .../results/indices/index_table_chapter_no_node.pl |  28 ++--
 .../multiple_index_text_sortas_seeentry_seealso.pl |   8 +-
 tp/t/results/indices/nodes_before_top.pl           |  22 +--
 .../nodes_before_top_and_sections_chapter.pl       |  30 ++--
 ...odes_before_top_and_sections_chapter_no_node.pl |  30 ++--
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  30 ++--
 .../indices/nodes_before_top_split_chapter.pl      |  22 +--
 .../nodes_before_top_split_chapter_no_nodes.pl     |  22 +--
 tp/t/results/indices/print_merged_index.pl         |   4 +-
 .../indices/printindex_between_node_section.pl     |  12 +-
 .../indices/printindex_between_part_chapter.pl     |  14 +-
 .../indices/printindex_index_entry_in_copying.pl   |  14 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  12 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  14 +-
 .../indices/printindex_with_space_before.pl        | Bin 7223 -> 7235 bytes
 .../indices/same_index_entry_merged_indices.pl     |   8 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   8 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |   8 +-
 tp/t/results/indices/seealso_duplicate.pl          |   4 +-
 tp/t/results/indices/seeentry.pl                   |   8 +-
 tp/t/results/indices/sorted_subentries.pl          |  12 +-
 tp/t/results/indices/split_chapter_index.pl        |  22 +--
 tp/t/results/indices/subentries.pl                 |   8 +-
 tp/t/results/indices/subentries_and_comments.pl    |   8 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   8 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   8 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   8 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   4 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   6 +-
 tp/t/results/indices/w_lines_count.pl              | Bin 9628 -> 9640 bytes
 tp/t/results/info_tests/anchor_and_spaces.pl       |   4 +-
 tp/t/results/info_tests/anchor_in_command.pl       |   2 +-
 tp/t/results/info_tests/before_node_and_section.pl |  12 +-
 tp/t/results/info_tests/center_flush.pl            |   4 +-
 .../info_tests/chinese_mixed_with_en_EUC_CN.pl     |   8 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   4 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  10 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  10 +-
 tp/t/results/info_tests/def_in_copying.pl          |   8 +-
 tp/t/results/info_tests/direntry_dircategory.pl    |  16 +--
 .../direntry_dircategory_and_commands.pl           |   8 +-
 tp/t/results/info_tests/empty_caption.pl           |   4 +-
 tp/t/results/info_tests/empty_copying_not_ended.pl |   2 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |   2 +-
 .../end_of_line_command_in_node_lines.pl           |  16 +--
 tp/t/results/info_tests/error_in_footnote.pl       |   4 +-
 tp/t/results/info_tests/file_only_png.pl           | Bin 3636 -> 3642 bytes
 tp/t/results/info_tests/float_long_captions.pl     |   6 +-
 tp/t/results/info_tests/float_without_type.pl      |   4 +-
 tp/t/results/info_tests/image_and_punctuation.pl   | Bin 7223 -> 7229 bytes
 .../info_tests/image_and_spaces_formatting.pl      |   2 +-
 tp/t/results/info_tests/image_extension.pl         | Bin 4593 -> 4599 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      | Bin 3115 -> 3121 bytes
 tp/t/results/info_tests/image_not_found.pl         |   2 +-
 tp/t/results/info_tests/image_quotes.pl            | Bin 2706 -> 2712 bytes
 .../info_tests/image_text_file_only_and_alt.pl     | Bin 2830 -> 2836 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |  14 +-
 .../info_tests/invalid_node_name_no_warning.pl     |  10 +-
 .../info_tests/invalid_node_name_warning.pl        |  10 +-
 tp/t/results/info_tests/known_encoding.pl          |   2 +-
 .../info_tests/multiline_image_and_align.pl        |   4 +-
 .../multitable_anchor_and_index_entry.pl           |   6 +-
 .../info_tests/nested_footnotes_separate.pl        |   2 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   6 +-
 tp/t/results/info_tests/no_node_but_top.pl         |   2 +-
 tp/t/results/info_tests/no_top_node.pl             |   2 +-
 tp/t/results/info_tests/note_in_strong.pl          |   2 +-
 .../info_tests/note_in_strong_end_of_line.pl       |   2 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |   8 +-
 .../info_tests/one_node_counted_elements.pl        |   4 +-
 .../info_tests/paragraphindent_and_preamble.pl     |   6 +-
 .../paragraphindent_in_preamble_and_in_document.pl |   6 +-
 .../info_tests/paragraphindent_not_in_preamble.pl  |   6 +-
 tp/t/results/info_tests/pxref_test.pl              |   2 +-
 tp/t/results/info_tests/quote_node_names_info.pl   |  24 ++--
 tp/t/results/info_tests/recursive_down_menu.pl     |  10 +-
 tp/t/results/info_tests/ref_tests.pl               |   2 +-
 .../similar_external_and_internal_node.pl          |   2 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   4 +-
 tp/t/results/info_tests/space_in_menu.pl           |  10 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |   2 +-
 tp/t/results/info_tests/split_no_copying.pl        |  10 +-
 tp/t/results/info_tests/split_nocopying.pl         |  10 +-
 tp/t/results/info_tests/split_nocopying_split.pl   |  10 +-
 .../info_tests/split_test_before_first_node.pl     |  10 +-
 .../split_test_before_first_node_no_empty_line.pl  |  10 +-
 tp/t/results/info_tests/test_index.pl              |  26 ++--
 tp/t/results/info_tests/text_before_node.pl        |  10 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   4 +-
 .../info_tests/two_paragraphindent_in_preamble.pl  |   6 +-
 ..._paragraphindent_in_preamble_and_in_document.pl |   6 +-
 tp/t/results/info_tests/unknown_encoding.pl        |   2 +-
 tp/t/results/info_tests/xref_quote_long_item.pl    |   2 +-
 tp/t/results/info_tests/xref_test.pl               |   2 +-
 .../access_document_name_in_handler.pl             |   8 +-
 ...tton_replacement_and_direction_customization.pl |   8 +-
 ..._replacement_direction_strings_customization.pl |   8 +-
 ...utton_replacement_for_special_unit_direction.pl |   8 +-
 .../init_files_tests/customize_special_element.pl  |  12 +-
 .../init_files_tests/customize_translations.pl     |  24 ++--
 .../init_files_tests/directions_string_base.pl     |  24 ++--
 .../init_files_tests/directions_string_undef.pl    |  24 ++--
 .../directions_string_undef_texi2html.pl           |  24 ++--
 .../init_files_tests/documentation_examples.pl     |  24 ++--
 .../documentation_examples_texi2html.pl            |  24 ++--
 .../redefined_buttons_functions.pl                 |  24 ++--
 .../ref_for_special_unit_direction.pl              |   8 +-
 .../init_files_tests/sc_formatting_with_css.pl     |   2 +-
 .../special_unit_direction_customization.pl        |   8 +-
 ...est_format_single_footnote_in_inline_content.pl |  12 +-
 .../translation_in_parser_in_translation.pl        |   8 +-
 .../init_files_tests/undefined_node_filename.pl    |   4 +-
 .../init_files_tests/unknown_custom_variable.pl    |   8 +-
 tp/t/results/invalid_nestings/bad_style_nesting.pl |   2 +-
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |   2 +-
 .../results/invalid_nestings/block_not_matching.pl |  16 +--
 .../invalid_nestings/cartouche_in_style_command.pl |   2 +-
 tp/t/results/invalid_nestings/center.pl            |  10 +-
 .../def_not_closed_in_menu_description.pl          |   2 +-
 .../invalid_nestings/enumerate_in_style_command.pl |   2 +-
 .../invalid_nestings/example_in_style_command.pl   |   2 +-
 .../invalid_nestings/float_in_style_command.pl     |   2 +-
 .../flushright_in_style_command.pl                 |   2 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |   2 +-
 .../formats_not_closed_in_example.pl               |   6 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |   4 +-
 tp/t/results/invalid_nestings/ignored_text.pl      |   4 +-
 tp/t/results/invalid_nestings/in_errormsg.pl       |   2 +-
 tp/t/results/invalid_nestings/in_table.pl          |  10 +-
 tp/t/results/invalid_nestings/item_in_ref.pl       |   2 +-
 .../itemx_in_itemize_enumerate_in_table.pl         |   6 +-
 .../invalid_nestings/menu_in_style_command.pl      |   4 +-
 .../multitable_in_style_command.pl                 |   2 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   2 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |   4 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |   6 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   2 +-
 .../invalid_nestings/on_block_command_line.pl      |   4 +-
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   4 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |   2 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   2 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   4 +-
 .../invalid_nestings/quotation_in_style_command.pl |   2 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |   2 +-
 tp/t/results/invalid_nestings/recursive_copying.pl |   2 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   2 +-
 .../invalid_nestings/ref_to_top_in_anchor.pl       |   2 +-
 .../results/invalid_nestings/section_in_copying.pl |   4 +-
 .../invalid_nestings/section_in_flushright.pl      |   4 +-
 .../invalid_nestings/section_in_footnote.pl        |   2 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |   4 +-
 .../section_in_nested_block_commands.pl            |   6 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   4 +-
 .../invalid_nestings/section_on_cartouche_line.pl  |   8 +-
 .../invalid_nestings/section_on_def_line.pl        |   2 +-
 .../invalid_nestings/section_on_defx_line.pl       |   2 +-
 .../invalid_nestings/section_on_enumerate_line.pl  |   8 +-
 .../invalid_nestings/section_on_float_line.pl      |   4 +-
 .../section_on_index_entry_line.pl                 |   2 +-
 .../invalid_nestings/section_on_itemize_line.pl    |  16 +--
 .../invalid_nestings/section_on_multitable_line.pl |  12 +-
 .../invalid_nestings/section_on_xtable_line.pl     |  16 +--
 .../style_not_closed_before_first_node.pl          |   2 +-
 .../style_not_closed_in_block_command.pl           |   2 +-
 .../style_not_closed_in_table_line.pl              |   2 +-
 .../style_not_closed_no_newline_root_commands.pl   |  10 +-
 .../style_not_closed_root_commands.pl              |  10 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   2 +-
 tp/t/results/invalid_nestings/table_in_code.pl     |   2 +-
 .../table_not_closed_in_menu_comment.pl            |   4 +-
 .../table_not_closed_in_menu_description.pl        |   4 +-
 .../results/invalid_nestings/table_on_item_line.pl |   4 +-
 .../unclosed_verb_on_section_line.pl               |   2 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   4 +-
 tp/t/results/itemize/accent_argument.pl            |   6 +-
 tp/t/results/itemize/asis_as_itemize_argument.pl   |   2 +-
 tp/t/results/itemize/bad_enumerate_arguments.pl    |  10 +-
 .../itemize/comment_first_on_enumerate_line.pl     |   2 +-
 .../itemize/comment_first_on_itemize_line.pl       |   2 +-
 tp/t/results/itemize/empty_accent_argument.pl      |   8 +-
 tp/t/results/itemize/enumerate_and_empty_lines.pl  |  12 +-
 tp/t/results/itemize/enumerate_argument.pl         |   8 +-
 tp/t/results/itemize/enumerate_argument_item.pl    |   8 +-
 tp/t/results/itemize/enumerate_in_example.pl       |   4 +-
 tp/t/results/itemize/enumerate_letters.pl          |   2 +-
 tp/t/results/itemize/enumerate_more_letters.pl     |   2 +-
 .../results/itemize/headitem_itemx_in_enumerate.pl |   2 +-
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  |   2 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  20 +--
 .../itemize/inter_item_commands_in_itemize.pl      |  14 +-
 tp/t/results/itemize/itemize_and_empty_lines.pl    |  28 ++--
 tp/t/results/itemize/itemize_in_example.pl         |  12 +-
 .../itemize/itemize_line_commands_with_brace.pl    |   4 +-
 tp/t/results/itemize/itemize_long_item.pl          |  10 +-
 tp/t/results/itemize/not_closed_item.pl            |   2 +-
 tp/t/results/itemize/not_closed_itemize.pl         |   2 +-
 tp/t/results/itemize/table_in_itemize.pl           |   4 +-
 tp/t/results/itemize/w_argument.pl                 |   2 +-
 tp/t/results/languages/appendix_translated.pl      |   6 +-
 tp/t/results/languages/command_translated.pl       |   8 +-
 tp/t/results/languages/documentlanguage.pl         |   8 +-
 .../documentlanguage_generated_master_menu.pl      |  20 +--
 tp/t/results/languages/documentlanguage_option.pl  |   8 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   8 +-
 .../results/languages/multiple_documentlanguage.pl |  10 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  10 +-
 .../languages/multiple_in_preamble_before_node.pl  |  10 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  30 ++--
 .../languages/multiple_lang_chapters_latex.pl      |  30 ++--
 .../languages/multiple_lang_chapters_texi2html.pl  |  30 ++--
 tp/t/results/languages/simple_documentlanguage.pl  |   4 +-
 tp/t/results/languages/unknown_language.pl         |   8 +-
 tp/t/results/languages/unknown_region.pl           |   4 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |   8 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |  10 +-
 .../anchor_in_copying_insertcopying_chap.pl        |  10 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |  12 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |  12 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  12 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   2 +-
 .../latex_tests/custom_heading_with_include.pl     |  66 ++++-----
 .../custom_heading_with_include_in_command.pl      |  66 ++++-----
 tp/t/results/latex_tests/custom_headings.pl        |  14 +-
 .../latex_tests/custom_headings_and_comments.pl    |  12 +-
 .../latex_tests/customize_informative_commands.pl  |   2 +-
 tp/t/results/latex_tests/enumerate_arguments.pl    |  12 +-
 .../latex_tests/error_in_sectioning_command.pl     |   8 +-
 tp/t/results/latex_tests/example_in_cartouche.pl   |   6 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  18 +--
 tp/t/results/latex_tests/fonttextsize.pl           |  18 +--
 tp/t/results/latex_tests/indices.pl                |   8 +-
 .../latex_tests/indices_disable_encoding.pl        |   8 +-
 .../informative_commands_in_top_node.pl            |   8 +-
 tp/t/results/latex_tests/nested_enumerate.pl       |   8 +-
 tp/t/results/latex_tests/nested_itemize.pl         |   8 +-
 tp/t/results/latex_tests/node_before_top.pl        |  10 +-
 tp/t/results/latex_tests/pagesizes.pl              |  10 +-
 tp/t/results/latex_tests/pagetype.pl               |  10 +-
 .../setchapternewpage_on_odd_titlepage.pl          |   2 +-
 ...chapternewpage_on_odd_titlepage_set_headings.pl |   2 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |   2 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |   8 +-
 tp/t/results/latex_tests/titlepage_and_headings.pl |   2 +-
 .../titlepage_and_setchapternewpage_odd.pl         |   2 +-
 .../titlepage_and_setchapternewpage_on.pl          |   2 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  12 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  10 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  10 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  10 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  10 +-
 .../titlepage_with_commands_classical.pl           |  14 +-
 .../latex_tests/top_no_sectioning_command.pl       |   6 +-
 .../results/latex_tests/verbatim_in_smallformat.pl |   4 +-
 tp/t/results/layout/navigation.pl                  |  22 +--
 tp/t/results/layout/navigation_chapter.pl          |  22 +--
 .../results/layout/navigation_chapter_no_header.pl |  22 +--
 .../navigation_chapter_no_header_vertical.pl       |  22 +--
 tp/t/results/layout/navigation_chapter_vertical.pl |  22 +--
 tp/t/results/layout/navigation_no_header.pl        |  22 +--
 .../layout/navigation_no_header_vertical.pl        |  22 +--
 tp/t/results/layout/navigation_node.pl             |  22 +--
 tp/t/results/layout/navigation_node_no_header.pl   |  22 +--
 .../layout/navigation_node_no_header_vertical.pl   |  22 +--
 tp/t/results/layout/navigation_node_vertical.pl    |  22 +--
 tp/t/results/layout/navigation_section.pl          |  22 +--
 .../results/layout/navigation_section_no_header.pl |  22 +--
 .../navigation_section_no_header_vertical.pl       |  22 +--
 tp/t/results/layout/navigation_section_vertical.pl |  22 +--
 .../layout/navigation_test_misc_file_collision.pl  |  22 +--
 .../layout/navigation_test_undef_top_buttons.pl    |  22 +--
 .../layout/navigation_test_zero_top_buttons.pl     |  22 +--
 tp/t/results/layout/navigation_vertical.pl         |  22 +--
 tp/t/results/layout/no_monolithic.pl               |  10 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |  10 +-
 tp/t/results/linemacro/api_doc_with_linemacro.pl   |  10 +-
 .../linemacro/arobase_brace_in_linemacro_call.pl   |   2 +-
 .../linemacro/begin_conditional_in_linemacro.pl    |   6 +-
 .../linemacro/block_begin_end_in_linemacro_call.pl |  14 +-
 tp/t/results/linemacro/blockitem_no_item.pl        |   4 +-
 tp/t/results/linemacro/brace_command_not_closed.pl |   2 +-
 tp/t/results/linemacro/braces_after_text.pl        |   4 +-
 .../linemacro/call_macro_in_linemacro_body.pl      |   6 +-
 .../linemacro/call_macro_in_linemacro_call.pl      |   8 +-
 .../linemacro/comment_at_end_of_linemacro_call.pl  |   2 +-
 .../results/linemacro/comment_in_linemacro_call.pl |   2 +-
 .../comment_in_one_argument_linemacro_call.pl      |   2 +-
 .../comment_on_linemacro_call_macro_expansion.pl   |   4 +-
 .../comment_on_linemacro_call_out_of_braces.pl     |   2 +-
 tp/t/results/linemacro/empty_last_argument.pl      |   4 +-
 .../linemacro/end_conditional_in_linemacro.pl      |   6 +-
 .../results/linemacro/last_argument_with_braces.pl |   4 +-
 tp/t/results/linemacro/missing_formal_arg.pl       |   2 +-
 tp/t/results/linemacro/nested_linemacro_calls.pl   |   6 +-
 .../linemacro/newline_and_continuation_in_brace.pl |   4 +-
 tp/t/results/linemacro/no_arguments.pl             |   2 +-
 tp/t/results/linemacro/paragraph_no_paragraph.pl   |   2 +-
 tp/t/results/linemacro/protected_spaces_on_line.pl |   2 +-
 .../protection_of_end_of_line_by_command.pl        |   2 +-
 .../linemacro/recursive_linemacro_in_body.pl       |   2 +-
 .../linemacro/recursive_linemacro_in_call.pl       |   2 +-
 .../linemacro/simple_nested_linemacro_calls.pl     |   8 +-
 .../linemacro/spaces_after_command_in_call.pl      |   4 +-
 ...paces_after_macro_linemacro_commands_in_call.pl |  10 +-
 .../spaces_after_unknown_command_in_call.pl        |   4 +-
 tp/t/results/linemacro/spaces_in_args.pl           |   4 +-
 tp/t/results/linemacro/spaces_in_call.pl           |   4 +-
 tp/t/results/linemacro/text_arguments.pl           |   2 +-
 tp/t/results/linemacro/verb_in_linemacro_call.pl   |   4 +-
 tp/t/results/linemacro/verb_not_closed.pl          |   2 +-
 .../verb_with_arobase_in_linemacro_call.pl         |   2 +-
 .../linemacro/verb_with_brace_in_linemacro_call.pl |   2 +-
 tp/t/results/macro/arg_body_expansion_order.pl     |   6 +-
 tp/t/results/macro/arg_not_closed.pl               |   2 +-
 tp/t/results/macro/arobase_brace_in_macro_call.pl  |   2 +-
 tp/t/results/macro/backslash_in_arg.pl             |   6 +-
 tp/t/results/macro/bad_argument.pl                 |   8 +-
 tp/t/results/macro/bad_formal_arg.pl               |   6 +-
 .../macro/bad_macro_name_with_underscore.pl        |   2 +-
 tp/t/results/macro/bib_example.pl                  |  42 +++---
 tp/t/results/macro/bye_in_macro.pl                 |   2 +-
 ...losing_brace_in_macro_call_in_ignored_inline.pl |   2 +-
 tp/t/results/macro/complete_macro_for_end.pl       |   4 +-
 tp/t/results/macro/complex_argument.pl             |  16 +--
 tp/t/results/macro/cpp_directives_after_macros.pl  |   4 +-
 tp/t/results/macro/cpp_directives_in_macro.pl      |   2 +-
 .../macro/cpp_directives_line_value_macro.pl       |   6 +-
 .../macro/definfoenclose_replaced_by_macro.pl      |   2 +-
 tp/t/results/macro/double_macro_definition.pl      |   4 +-
 tp/t/results/macro/double_recursive_macro_call.pl  |   4 +-
 tp/t/results/macro/empty_end.pl                    |   2 +-
 tp/t/results/macro/empty_macro_argument.pl         |   4 +-
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |   4 +-
 tp/t/results/macro/empty_macro_no_arg.pl           |   2 +-
 tp/t/results/macro/expand_two_same.pl              |   2 +-
 tp/t/results/macro/expansion_order.pl              |   4 +-
 tp/t/results/macro/form_feeds.pl                   |   4 +-
 tp/t/results/macro/glossary.pl                     |  32 ++---
 tp/t/results/macro/ifclear_in_macro.pl             |   4 +-
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |   6 +-
 tp/t/results/macro/ifset_in_macro.pl               |   4 +-
 tp/t/results/macro/ifset_in_macro_set.pl           |   4 +-
 tp/t/results/macro/ignored_macro_definition.pl     |   2 +-
 tp/t/results/macro/implicit_quoting_one_arg.pl     |   2 +-
 tp/t/results/macro/implicit_quoting_recursion.pl   |   2 +-
 tp/t/results/macro/include_after_empty_line_arg.pl |   2 +-
 tp/t/results/macro/leading_spaces_no_ignore.pl     |   2 +-
 tp/t/results/macro/line_after_recursive_call.pl    |   2 +-
 .../macro/line_end_accent_command_macro_call.pl    |   4 +-
 tp/t/results/macro/macro_after_paragraph.pl        |   2 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |  16 +--
 .../macro_before_specific_line_command_args.pl     |   2 +-
 tp/t/results/macro/macro_call_empty_middle_arg.pl  |   2 +-
 tp/t/results/macro/macro_call_empty_two_arg.pl     |   2 +-
 .../macro/macro_call_in_ignored_inlinefmtifelse.pl |   2 +-
 .../macro/macro_call_in_inlinefmtifelse_format.pl  |   2 +-
 tp/t/results/macro/macro_call_in_node_manual.pl    |  14 +-
 .../macro/macro_end_call_in_ignored_inlinefmt.pl   |   2 +-
 .../macro_end_call_in_ignored_inlinefmtifelse.pl   |   2 +-
 ...cro_end_call_in_ignored_inlinefmtifelse_else.pl |   2 +-
 .../macro/macro_end_call_in_ignored_inlineraw.pl   |   2 +-
 .../results/macro/macro_end_call_in_ignored_raw.pl |   4 +-
 tp/t/results/macro/macro_expands_to_empty.pl       |   2 +-
 tp/t/results/macro/macro_expansion.pl              |  14 +-
 .../macro_expansion_end_in_conditional_end.pl      |   4 +-
 .../macro_expansion_end_in_conditional_line.pl     |   4 +-
 ...macro_expansion_end_in_ignored_ifset_content.pl |   4 +-
 ..._expansion_end_in_ignored_nested_conditional.pl |   4 +-
 ..._end_in_ignored_nested_different_conditional.pl |   4 +-
 .../macro_expansion_in_multitable_prototype.pl     |   6 +-
 .../macro/macro_for_dot_in_menu_not_separator.pl   |   4 +-
 tp/t/results/macro/macro_for_end.pl                |   4 +-
 .../macro/macro_for_ignored_line_command.pl        |   2 +-
 tp/t/results/macro/macro_for_verb.pl               |   2 +-
 ...macro_imbricated_with_beginning_command_name.pl |   2 +-
 tp/t/results/macro/macro_in_accent.pl              |   4 +-
 tp/t/results/macro/macro_in_brace_command.pl       |   6 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   2 +-
 tp/t/results/macro/macro_in_empty_menu_comment.pl  |   4 +-
 .../macro_in_empty_multitable_empty_before_item.pl |   4 +-
 .../macro_in_empty_table_empty_before_item.pl      |   4 +-
 tp/t/results/macro/macro_in_empty_text.pl          |   4 +-
 tp/t/results/macro/macro_in_end_argument.pl        |   4 +-
 tp/t/results/macro/macro_in_ifset.pl               |   4 +-
 tp/t/results/macro/macro_in_ifset_end_in_arg.pl    |   4 +-
 tp/t/results/macro/macro_in_index_commands.pl      |  18 +--
 .../macro/macro_in_invalid_documentencoding.pl     |   2 +-
 tp/t/results/macro/macro_in_macro_arg.pl           |   6 +-
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |   4 +-
 tp/t/results/macro/macro_in_menu.pl                |  14 +-
 .../macro_in_menu_comment_closed_by_detailmenu.pl  |   6 +-
 .../macro/macro_in_menu_comment_like_entry.pl      |   4 +-
 tp/t/results/macro/macro_in_menu_description.pl    |   4 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  80 +++++------
 .../macro/macro_in_multitable_empty_before_item.pl |   4 +-
 .../macro/macro_in_table_empty_before_item.pl      |   4 +-
 .../macro_inlineifcond_end_in_empty_ignored.pl     |   2 +-
 .../macro/macro_inlineifcond_end_in_empty_set.pl   |   2 +-
 tp/t/results/macro/macro_name_with_digit.pl        |   4 +-
 tp/t/results/macro/macro_name_with_hyphen.pl       |   2 +-
 tp/t/results/macro/macro_name_zero.pl              |   2 +-
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |   2 +-
 tp/t/results/macro/macro_no_arg_expansion.pl       |   2 +-
 tp/t/results/macro/macro_no_argument.pl            |   2 +-
 tp/t/results/macro/macro_not_closed.pl             |   2 +-
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |   2 +-
 .../macro/macro_replaced_by_definfoenclose.pl      |   2 +-
 .../macro_with_error_at_end_line_after_macro.pl    |   2 +-
 tp/t/results/macro/macro_zero.pl                   |   2 +-
 tp/t/results/macro/nested_macro_call.pl            |   4 +-
 tp/t/results/macro/no_macrobody.pl                 |   2 +-
 tp/t/results/macro/non_ascii_in_macro_name.pl      |   2 +-
 tp/t/results/macro/paragraph_and_macro.pl          |   6 +-
 tp/t/results/macro/protect_comma_macro_line.pl     |   2 +-
 tp/t/results/macro/protect_in_body.pl              |   2 +-
 tp/t/results/macro/protect_in_body_line_arg.pl     |   2 +-
 tp/t/results/macro/protect_in_body_one_arg.pl      |   2 +-
 tp/t/results/macro/recursive_call_in_argument.pl   |   2 +-
 tp/t/results/macro/recursive_call_in_macro.pl      |   2 +-
 tp/t/results/macro/recursive_call_in_rmacro.pl     |   2 +-
 tp/t/results/macro/redefine_texinfo_macro.pl       |   2 +-
 tp/t/results/macro/simple_imbricated_macro.pl      |   4 +-
 .../macro/simple_imbricated_macro_rmacro.pl        |   4 +-
 tp/t/results/macro/space_macro_after_end.pl        |   4 +-
 .../macro/space_macro_after_end_verbatim.pl        |   4 +-
 tp/t/results/macro/text_before_after.pl            |   2 +-
 tp/t/results/macro/too_much_args.pl                |   2 +-
 tp/t/results/macro/two_macros_on_a_line.pl         |   4 +-
 .../macro/unpaired_backslash_in_macro_body.pl      |   2 +-
 .../macro/verb_with_arobase_in_macro_call.pl       |   2 +-
 .../results/macro/verb_with_brace_in_macro_call.pl |   2 +-
 tp/t/results/macro/zero_argument.pl                |   4 +-
 tp/t/results/macro/zero_argument_comment.pl        |   4 +-
 ...pendix_and_associated_part_in_generated_menu.pl |  24 ++--
 tp/t/results/menu/bad_beginning.pl                 |   2 +-
 .../menu/block_commands_in_menu_description.pl     |  14 +-
 .../menu/commands_in_nodedescriptionblock.pl       |  20 +--
 tp/t/results/menu/comment_on_menu_line.pl          |   8 +-
 tp/t/results/menu/dash_in_menu.pl                  |   2 +-
 tp/t/results/menu/detailmenu.pl                    |   4 +-
 tp/t/results/menu/detailmenu_in_description.pl     |   4 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  34 ++---
 tp/t/results/menu/detailmenu_unknown_node.pl       |   6 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   6 +-
 tp/t/results/menu/empty_leading_menu_comment.pl    |   4 +-
 tp/t/results/menu/empty_menu_description.pl        |   4 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |   6 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  12 +-
 tp/t/results/menu/example_in_menu_comment.pl       |   4 +-
 tp/t/results/menu/example_in_menu_description.pl   |   8 +-
 tp/t/results/menu/format_menu_undef.pl             |   8 +-
 tp/t/results/menu/formats_in_menu.pl               |  12 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   6 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   4 +-
 .../results/menu/leading_space_before_menu_star.pl |   4 +-
 tp/t/results/menu/menu_entry_name.pl               |   2 +-
 tp/t/results/menu/menu_entry_name_comment.pl       |   2 +-
 tp/t/results/menu/menu_entry_no_entry.pl           |   2 +-
 tp/t/results/menu/menu_entry_no_entry_location.pl  |   2 +-
 tp/t/results/menu/menu_entry_node.pl               |   2 +-
 tp/t/results/menu/menu_entry_node_comments.pl      |   2 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   4 +-
 tp/t/results/menu/menu_in_example.pl               |  10 +-
 .../menu/menu_no_closed_after_empty_line.pl        |   2 +-
 .../results/menu/menu_no_closed_entry_beginning.pl |   2 +-
 tp/t/results/menu/menu_no_closed_in_description.pl |   2 +-
 tp/t/results/menu/menu_no_closed_in_entry.pl       |   2 +-
 tp/t/results/menu/menu_no_closed_star.pl           |   2 +-
 tp/t/results/menu/menu_node_unterminated.pl        |   4 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   6 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   6 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl |  30 ++--
 tp/t/results/menu/multiple_menus.pl                |   6 +-
 tp/t/results/menu/no_colon_in_menu.pl              |   4 +-
 tp/t/results/menu/nodedescription_descriptions.pl  |  34 ++---
 .../menu/nodedescriptionblock_descriptions.pl      |  40 +++---
 .../menu/part_appendix_in_generated_menu.pl        |  22 +--
 tp/t/results/menu/reference_to_external_manual.pl  |   4 +-
 tp/t/results/menu/sc_in_menu.pl                    |  12 +-
 tp/t/results/menu/simple.pl                        |   2 +-
 tp/t/results/menu/simple_no_menu.pl                |   2 +-
 .../menu/space_and_commands_in_menu_node.pl        |  10 +-
 tp/t/results/menu/submenu_in_example.pl            |  16 +--
 tp/t/results/menu/verb_in_menu_description.pl      |   6 +-
 .../codequoteundirected_codequotebacktick.pl       |  30 ++--
 .../misc_commands/comment_space_command_on_line.pl |  10 +-
 tp/t/results/misc_commands/double_exdent.pl        |   4 +-
 tp/t/results/misc_commands/footnote_in_center.pl   |   4 +-
 .../misc_commands/heading_command_in_commands.pl   |   4 +-
 tp/t/results/misc_commands/indent_in_quotation.pl  |   2 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |   8 +-
 .../misc_commands/kbdinputstyle_in_table.pl        |  32 ++---
 .../no_empty_line_between_headings.pl              |   6 +-
 tp/t/results/misc_commands/nodedescription.pl      |   8 +-
 .../misc_commands/noindent_after_smallexample.pl   |   2 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   8 +-
 tp/t/results/misc_commands/sp.pl                   |   2 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  16 +--
 .../misc_commands/text_before_line_command.pl      |   6 +-
 tp/t/results/moresectioning/anchor_in_footnote.pl  |  10 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |  10 +-
 .../anchor_in_footnote_separate_split_node.pl      |  10 +-
 .../anchor_in_footnote_split_node.pl               |  10 +-
 tp/t/results/moresectioning/chapter_sections.pl    |  16 +--
 .../moresectioning/character_and_spaces_in_refs.pl |  22 +--
 .../character_and_spaces_in_refs_out.pl            |  22 +--
 tp/t/results/moresectioning/complex.pl             |  64 ++++-----
 .../moresectioning/complex_split_at_node.pl        |  64 ++++-----
 tp/t/results/moresectioning/contents.pl            |  22 +--
 .../moresectioning/contents_and_shortcontents.pl   |  22 +--
 .../contents_at_begin_chapter_without_node.pl      |   6 +-
 .../moresectioning/contents_at_end_document.pl     |   6 +-
 .../contents_at_end_document_after_node.pl         |  10 +-
 .../results/moresectioning/contents_in_document.pl |   6 +-
 tp/t/results/moresectioning/empty_top_node_up.pl   |   8 +-
 .../equivalent_nodes_defined_linked.pl             |   8 +-
 .../results/moresectioning/internal_top_node_up.pl |   8 +-
 .../moresectioning/lowered_subsubsection.pl        |  38 ++---
 tp/t/results/moresectioning/loweredheading.pl      |   2 +-
 .../moresectioning/more_sections_than_nodes.pl     |  40 +++---
 .../more_sections_than_nodes_texi2html.pl          |  40 +++---
 tp/t/results/moresectioning/no_element.pl          |   4 +-
 .../moresectioning/nodes_before_after_top_xref.pl  |  12 +-
 ...nodes_no_section_footnote_no_top_node_output.pl |   4 +-
 .../non_automatic_internal_top_node_up.pl          |   8 +-
 .../non_automatic_top_node_up_and_url.pl           |   8 +-
 .../non_automatic_top_node_up_url.pl               |   8 +-
 .../moresectioning/only_special_spaces_node.pl     |  28 ++--
 .../moresectioning/placed_things_before_element.pl |   6 +-
 .../placed_things_before_element_no_use_node.pl    |   6 +-
 .../moresectioning/placed_things_before_node.pl    |  12 +-
 tp/t/results/moresectioning/raiselowersections.pl  |  42 +++---
 tp/t/results/moresectioning/rec_nodes.pl           |  20 +--
 .../moresectioning/section_in_unnumbered_info.pl   | 154 ++++++++++-----------
 .../section_in_unnumbered_plaintext.pl             | 154 ++++++++++-----------
 .../moresectioning/sectioning_part_appendix.pl     |  22 +--
 .../sectioning_part_appendix_no_top.pl             |  20 +--
 .../sectioning_part_appendix_texi2html_chapter.pl  |  22 +--
 tp/t/results/moresectioning/sections_test.pl       |  22 +--
 .../moresectioning/sections_test_no_use_nodes.pl   |  22 +--
 ...ctions_test_no_use_nodes_use_node_directions.pl |  22 +--
 tp/t/results/moresectioning/shortcontents.pl       |  22 +--
 .../moresectioning/special_spaces_in_nodes.pl      |  26 ++--
 .../results/moresectioning/top_chapter_sections.pl |  18 +--
 tp/t/results/moresectioning/top_node_up_url.pl     |   8 +-
 tp/t/results/moresectioning/topic_guide.pl         |  38 ++---
 tp/t/results/multitable/empty_headitem.pl          |   2 +-
 tp/t/results/multitable/empty_item_tab.pl          |   4 +-
 .../multitable/empty_multitable_with_cells.pl      |   2 +-
 tp/t/results/multitable/fullwidth_in_prototype.pl  |   2 +-
 .../inter_item_commands_in_multitable.pl           |   6 +-
 .../multitable/multitable_begin_with_tab.pl        |   4 +-
 ...ultitable_bracketed_no_inter_space_prototype.pl |   2 +-
 ...titable_bracketed_prototype_empty_not_closed.pl |   2 +-
 ...bracketed_prototype_empty_not_closed_comment.pl |   2 +-
 ..._bracketed_prototype_empty_spaces_not_closed.pl |   2 +-
 ...ed_prototype_empty_spaces_not_closed_comment.pl |   2 +-
 .../multitable_bracketed_prototype_not_closed.pl   |   2 +-
 ...table_bracketed_prototype_not_closed_comment.pl |   2 +-
 ...bracketed_prototype_not_closed_space_comment.pl |   2 +-
 .../multitable_empty_bracketed_prototype.pl        |   2 +-
 tp/t/results/multitable/multitable_figure_space.pl |   2 +-
 tp/t/results/multitable/multitable_in_example.pl   |   4 +-
 tp/t/results/multitable/multitable_not_closed.pl   |   2 +-
 .../multitable/multitable_not_closed_item.pl       |   2 +-
 .../multitable/multitable_not_closed_item_tab.pl   |   2 +-
 .../multitable_one_column_too_much_cells.pl        |   2 +-
 .../multitable_two_columns_too_much_cells.pl       |   2 +-
 .../multitable/multitable_with_empty_item_tab.pl   |   2 +-
 .../results/multitable/not_letters_in_prototype.pl |   2 +-
 tp/t/results/multitable/paragraph_in_cells.pl      |   2 +-
 .../results/multitable/prototype_brace_no_brace.pl |   2 +-
 .../multitable/prototype_brace_no_brace_comment.pl |   2 +-
 tp/t/results/multitable/prototype_no_brace.pl      |   2 +-
 tp/t/results/multitable/ref_in_multitable.pl       |   2 +-
 tp/t/results/multitable/w_in_multitable.pl         |   2 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |  20 +--
 tp/t/results/paragraph/comment_in_quotation.pl     |   4 +-
 .../indent_before_macro_definition_and_other.pl    |   6 +-
 .../paragraph/paragraph_count_and_example.pl       |   2 +-
 tp/t/results/paragraph/paragraph_indent_asis.pl    |   2 +-
 tp/t/results/plaintext_tests/all_spaces.pl         |   4 +-
 .../at_commands_glued_in_example.pl                |   2 +-
 .../cartouche_and_paragraph_indentation.pl         |  16 +--
 .../plaintext_tests/chinese_mixed_with_en.pl       |   8 +-
 .../plaintext_tests/empty_line_in_example_end.pl   |   2 +-
 .../plaintext_tests/empty_multitable_in_itemize.pl |   4 +-
 tp/t/results/plaintext_tests/expanded_tex.pl       |   2 +-
 .../flushright_not_closed_and_format.pl            |   4 +-
 tp/t/results/plaintext_tests/html_expanded.pl      |   2 +-
 .../insert_copying_and_paragraph.pl                |   2 +-
 .../plaintext_tests/isolated_html_expanded.pl      |   2 +-
 .../itemize_in_headitem_in_example.pl              |  10 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  16 +--
 .../plaintext_tests/line_passed_and_formats.pl     |  60 ++++----
 .../plaintext_tests/long_uref_after_item.pl        |   2 +-
 .../plaintext_tests/multiline_image_and_align.pl   |   2 +-
 tp/t/results/plaintext_tests/multitable.pl         |  10 +-
 .../multitable_in_example_extraneous_item_tab.pl   |   4 +-
 .../multitable_in_example_extraneous_tab.pl        |   4 +-
 .../plaintext_tests/nested_code_commands.pl        |   4 +-
 .../plaintext_tests/nested_indentedblock.pl        |   8 +-
 tp/t/results/plaintext_tests/nested_multitable.pl  |   4 +-
 .../plaintext_tests/no_empty_line_after_section.pl |   8 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |   2 +-
 .../plaintext_tests/protect_spaces_on_line.pl      |   2 +-
 .../punctuation_sc_accents_ascii_glyph.pl          |   8 +-
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |   8 +-
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |   8 +-
 .../punctuation_sc_accents_default.pl              |   8 +-
 .../punctuation_sc_accents_default_latin1.pl       |   8 +-
 .../punctuation_sc_accents_default_usascii.pl      |   8 +-
 .../punctuation_sc_accents_disable_encoding.pl     |   8 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |   8 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |   8 +-
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |   8 +-
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |   8 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |   8 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |   8 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  24 ++--
 .../plaintext_tests/settitle_and_empty_top.pl      |   2 +-
 .../sp_with_text_before_in_example.pl              |   2 +-
 .../plaintext_tests/star_at_command_formatting.pl  |   6 +-
 .../plaintext_tests/tab_in_table_in_example.pl     |   4 +-
 .../results/plaintext_tests/tab_item_in_example.pl |   2 +-
 tp/t/results/preformatted/caption_in_example.pl    |   4 +-
 .../comment_example_and_blank_lines.pl             |   8 +-
 tp/t/results/preformatted/comments_in_example.pl   |   6 +-
 tp/t/results/preformatted/def_in_example.pl        |   2 +-
 tp/t/results/preformatted/empty_line.pl            |   2 +-
 .../preformatted/empty_line_style_command.pl       |   2 +-
 .../preformatted/example_at_commands_arguments.pl  |   2 +-
 tp/t/results/preformatted/example_class.pl         |   2 +-
 .../preformatted/example_empty_arguments.pl        |   6 +-
 .../example_invalid_at_commands_arguments.pl       |   2 +-
 tp/t/results/preformatted/example_multi_class.pl   |   2 +-
 .../preformatted/insertcopying_in_example.pl       |   2 +-
 .../preformatted/nested_example_and_comment.pl     |  12 +-
 tp/t/results/preformatted/nested_formats.pl        |   8 +-
 tp/t/results/preformatted/page_in_example.pl       |   2 +-
 tp/t/results/preformatted/quote_dash_in_display.pl |   2 +-
 tp/t/results/preformatted/quote_dash_in_example.pl |   2 +-
 .../preformatted/text_on_display_command_line.pl   |  10 +-
 .../preformatted/text_on_example_command_line.pl   |  10 +-
 tp/t/results/preformatted/titlefont_in_example.pl  |   2 +-
 .../results/quotation/comment_on_quotation_line.pl |   2 +-
 tp/t/results/quotation/empty_quotation.pl          |   8 +-
 .../quotation/footnote_in_quotation_with_arg.pl    |   2 +-
 .../quotation/only_comment_on_quotation_line.pl    |   2 +-
 tp/t/results/quotation/quotation_and_author.pl     |   6 +-
 .../quotation/quotation_author_in_example.pl       |   4 +-
 .../quotation_beginning_and_end_on_line.pl         |   2 +-
 .../space_at_commands_end_quotation_line.pl        |   4 +-
 tp/t/results/quotation/standard_quotations.pl      |  12 +-
 tp/t/results/raw/beginning_and_end_on_line.pl      |   6 +-
 tp/t/results/raw/braces_in_tex.pl                  |   6 +-
 tp/t/results/raw/comments_on_raw_block_line.pl     |   4 +-
 tp/t/results/raw/displaymath.pl                    |   4 +-
 tp/t/results/raw/displaymath_not_closed.pl         |   2 +-
 ...pty_line_in_command_in_expanded_not_expanded.pl |   4 +-
 tp/t/results/raw/inline_in_example.pl              |   2 +-
 tp/t/results/raw/inlineraw_not_closed.pl           |   2 +-
 tp/t/results/raw/lone_braces_in_html.pl            |   4 +-
 tp/t/results/raw/misc_raw.pl                       |   6 +-
 tp/t/results/raw/misc_raw_comments.pl              |   6 +-
 tp/t/results/raw/nested_macros.pl                  |   2 +-
 tp/t/results/raw/raw_commands_and_end_of_lines.pl  |  36 ++---
 tp/t/results/raw/raw_expanded_in_style.pl          |   2 +-
 tp/t/results/raw/raw_in_example.pl                 |  10 +-
 tp/t/results/raw/raw_in_para.pl                    |   6 +-
 tp/t/results/raw/raw_in_style.pl                   |   2 +-
 tp/t/results/raw/raw_not_closed.pl                 |   2 +-
 .../raw/second_level_lone_braces_in_html.pl        |   4 +-
 ...econd_level_lone_braces_in_html_not_expanded.pl |   4 +-
 tp/t/results/raw/space_before_end.pl               |   6 +-
 tp/t/results/raw/spurious_arg_on_line.pl           |   6 +-
 tp/t/results/raw/tex_not_closed.pl                 |   2 +-
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   |  24 ++--
 tp/t/results/raw/verbatim_in_brace_command.pl      |   2 +-
 tp/t/results/raw/verbatim_not_closed.pl            |   2 +-
 tp/t/results/regions/anchor_in_copying.pl          |   6 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   6 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |  10 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |  10 +-
 tp/t/results/regions/copying_not_closed.pl         |   2 +-
 tp/t/results/regions/double_copying.pl             |   4 +-
 .../results/regions/double_titlepage_not_closed.pl |   4 +-
 tp/t/results/regions/format_in_titlepage.pl        |   8 +-
 .../regions/format_in_titlepage_titlepage.pl       |   8 +-
 tp/t/results/regions/ref_in_copying.pl             |  12 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |  16 +--
 tp/t/results/regions/today_in_copying.pl           |   8 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |   2 +-
 tp/t/results/sectioning/anchor_zero.pl             |   2 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |   2 +-
 .../sectioning/automatic_menu_referencing_node.pl  |  12 +-
 .../sectioning/chapter_before_and_after_part.pl    |   6 +-
 tp/t/results/sectioning/chapter_before_part.pl     |   4 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  12 +-
 .../sectioning/chapter_between_nodes_texi2html.pl  |  12 +-
 .../chapter_between_nodes_with_appendix.pl         |  12 +-
 .../chapter_between_nodes_with_appendix_nomenu.pl  |  12 +-
 .../chapter_node_before_and_after_part.pl          |  12 +-
 .../sectioning/character_and_spaces_in_node.pl     |  10 +-
 tp/t/results/sectioning/contents_and_parts.pl      |  22 +--
 tp/t/results/sectioning/contents_in_html_text.pl   |   8 +-
 .../sectioning/contents_with_only_top_node.pl      |   2 +-
 .../results/sectioning/double_node_anchor_float.pl |  14 +-
 tp/t/results/sectioning/double_part.pl             |  14 +-
 ...double_recursive_self_section_node_reference.pl |  10 +-
 ...sive_self_section_node_reference_no_use_node.pl |  10 +-
 .../double_recursive_self_section_reference.pl     |   8 +-
 tp/t/results/sectioning/double_top.pl              |   4 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |   6 +-
 tp/t/results/sectioning/double_top_section.pl      |   4 +-
 tp/t/results/sectioning/email_in_node.pl           |   2 +-
 tp/t/results/sectioning/empty_node.pl              |   4 +-
 .../sectioning/empty_nodes_with_commands.pl        |   8 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   2 +-
 .../results/sectioning/empty_section_in_chapter.pl |   4 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   6 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   6 +-
 .../sectioning/equivalent_nodes_novalidate.pl      |   6 +-
 .../results/sectioning/explicit_node_directions.pl |   8 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  14 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |  10 +-
 .../in_menu_only_special_ascii_spaces_node.pl      |  14 +-
 .../in_menu_only_special_ascii_spaces_node_menu.pl |  14 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |  30 ++--
 .../in_menu_only_special_spaces_node_menu.pl       |  30 ++--
 tp/t/results/sectioning/lone_Top_node.pl           |   8 +-
 tp/t/results/sectioning/loop_nodes.pl              |  16 +--
 tp/t/results/sectioning/menutextorder.pl           |  34 ++---
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  22 +--
 tp/t/results/sectioning/next_no_prev_to_node.pl    |   8 +-
 .../results/sectioning/no_argument_and_contents.pl |   4 +-
 tp/t/results/sectioning/no_menu.pl                 |  16 +--
 tp/t/results/sectioning/node_empty_direction.pl    |   2 +-
 tp/t/results/sectioning/node_line_arguments.pl     |  14 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |   4 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  16 +--
 .../sectioning/node_part_chapter_after_top.pl      |  12 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   8 +-
 .../node_sectop_before_chapter_no_node.pl          |   6 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  10 +-
 tp/t/results/sectioning/node_simple.pl             |   2 +-
 tp/t/results/sectioning/node_too_much_args.pl      |   2 +-
 .../node_up_direction_for_top_with_manual.pl       |   2 +-
 tp/t/results/sectioning/node_up_external_node.pl   |   6 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  18 +--
 ...fter_top_before_chapter_no_use_nodes_chapter.pl |  10 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  10 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  10 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  10 +-
 .../nodes_after_top_before_chapter_sections.pl     |  10 +-
 .../nodes_after_top_before_chapter_texi2html.pl    |  10 +-
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |  10 +-
 .../nodes_after_top_before_section_nodes.pl        |  10 +-
 .../nodes_after_top_before_section_sections.pl     |  10 +-
 ...s_after_top_before_section_texi2html_chapter.pl |  10 +-
 ...after_top_before_section_texi2html_use_nodes.pl |  10 +-
 ...p_before_section_texi2html_use_nodes_chapter.pl |  10 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  12 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  16 +--
 .../nodes_no_node_top_explicit_directions.pl       |   6 +-
 tp/t/results/sectioning/novalidate.pl              |   4 +-
 .../one_node_explicit_directions_anchor.pl         |   2 +-
 ..._node_explicit_directions_anchor_no_use_node.pl |   2 +-
 tp/t/results/sectioning/one_subsection.pl          |   2 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |   4 +-
 tp/t/results/sectioning/part_before_chapter.pl     |   4 +-
 tp/t/results/sectioning/part_before_section.pl     |   4 +-
 tp/t/results/sectioning/part_before_top.pl         |   4 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  12 +-
 tp/t/results/sectioning/part_chapter_appendix.pl   |   6 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  10 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  10 +-
 .../sectioning/part_node_chapter_after_top.pl      |  14 +-
 .../sectioning/part_node_chapter_appendix.pl       |  14 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  16 +--
 .../sectioning/part_node_node_part_appendix.pl     |  18 +--
 tp/t/results/sectioning/part_node_part_appendix.pl |  16 +--
 .../sectioning/part_node_part_node_appendix.pl     |  18 +--
 tp/t/results/sectioning/part_section_part.pl       |   6 +-
 .../sectioning/protected_node_parentheses.pl       |   8 +-
 .../sectioning/recursive_self_section_reference.pl |   4 +-
 tp/t/results/sectioning/ref_to_top.pl              |   4 +-
 .../reference_to_only_special_spaces_node.pl       |  12 +-
 .../sectioning/section_before_after_top_node.pl    |   8 +-
 .../section_before_after_top_node_last_node.pl     |  10 +-
 tp/t/results/sectioning/section_before_chapter.pl  |   4 +-
 tp/t/results/sectioning/section_before_part.pl     |   4 +-
 tp/t/results/sectioning/section_before_top.pl      |  10 +-
 .../sectioning/section_before_top_no_node.pl       |   4 +-
 .../results/sectioning/section_below_unnumbered.pl |  16 +--
 .../sectioning/section_below_unnumbered_no_top.pl  |   4 +-
 .../sectioning/section_chapter_before_top.pl       |   6 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  16 +--
 .../results/sectioning/section_node_before_part.pl |   6 +-
 tp/t/results/sectioning/sections.pl                |   2 +-
 tp/t/results/sectioning/semi_auto.pl               |  20 +--
 .../setfilename_on_top_and_after_node.pl           |   4 +-
 tp/t/results/sectioning/space_in_node.pl           |  10 +-
 .../sectioning/split_for_format_not_split.pl       |   2 +-
 .../sectioning/top_no_argument_and_content.pl      |   2 +-
 .../results/sectioning/top_no_argument_and_node.pl |   4 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   4 +-
 .../sectioning/top_node_no_menu_direction.pl       |   6 +-
 tp/t/results/sectioning/top_node_part_top.pl       |   6 +-
 tp/t/results/sectioning/top_part_chapter.pl        |   6 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |   6 +-
 .../sectioning/top_without_node_sections.pl        |   6 +-
 .../top_without_node_texi2html_no_use_nodes.pl     |   6 +-
 .../transliterated_split_equivalent_nodes.pl       |  12 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  14 +-
 .../sectioning/two_nodes_at_the_end_nodes.pl       |  14 +-
 .../sectioning/two_nodes_at_the_end_texi2html.pl   |  14 +-
 .../sectioning/two_nodes_between_chapters.pl       |  16 +--
 .../sectioning/two_nodes_between_chapters_nodes.pl |  16 +--
 .../two_nodes_between_chapters_texi2html.pl        |  16 +--
 .../sectioning/two_unnumbered_no_argument.pl       |   4 +-
 .../unknown_node_direction_novalidate.pl           |   2 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   4 +-
 .../sectioning/unknown_node_in_menu_novalidate.pl  |   4 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |   6 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |   4 +-
 .../sectioning/unnumbered_before_top_node.pl       |   4 +-
 tp/t/results/sectioning/unnumbered_no_argument.pl  |   2 +-
 .../unnumbered_top_without_node_nodes.pl           |  10 +-
 .../unnumbered_top_without_node_sections.pl        |  10 +-
 ...dex_entries_relate_to_item_no_transformation.pl |  10 +-
 .../index_entries_relate_to_item_transformation.pl |  10 +-
 .../insert_nodes_for_sectioning_commands.pl        |  42 +++---
 tp/t/results/transformations/master_menu_fr.pl     |  18 +--
 .../transformations/protect_colon_source_mark.pl   |   2 +-
 .../transformations/protect_comma_source_mark.pl   |   2 +-
 ...st_parenthesis_after_parenthesis_source_mark.pl |   2 +-
 .../protect_first_parenthesis_source_mark.pl       |   2 +-
 ...otect_hashchar_at_line_beginning_source_mark.pl |   6 +-
 ...ct_node_after_label_source_mark_in_protected.pl |   2 +-
 ...generate_master_menu_no_need_for_master_menu.pl |  10 +-
 .../regenerate_master_menu_with_menu_comment.pl    |  16 +--
 tp/t/results/value/set_in_item_missing_line.pl     |   4 +-
 tp/t/results/value/set_on_item_line.pl             |   4 +-
 tp/t/results/value/value_in_index_commands.pl      |   4 +-
 tp/t/results/value/value_in_misc_commands.pl       |  14 +-
 tp/t/results/value/value_in_node.pl                |  14 +-
 tp/t/results/value/value_node_directions.pl        |  12 +-
 .../value_and_macro/comma_value_in_macro_arg.pl    |   2 +-
 tp/t/results/value_and_macro/macro_in_value.pl     |   2 +-
 .../results/value_and_macro/value_in_macro_body.pl |   2 +-
 .../value_and_macro/value_in_macro_formal_arg.pl   |   2 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |  18 +--
 tp/t/results/xml_tests/comments_end_lines.pl       |  20 +--
 .../xml_tests/comments_on_block_command_lines.pl   |  40 +++---
 tp/t/results/xml_tests/image_inline_or_not.pl      |  18 +--
 tp/t/results/xml_tests/macro_and_args.pl           |   4 +-
 tp/t/results/xml_tests/raw.pl                      |   4 +-
 tp/t/results/xml_tests/raw_and_comments.pl         |   4 +-
 .../xml_tests/sectioning_test_no_use_nodes.pl      |  16 +--
 tp/t/results/xml_tests/sectioning_test_ref.pl      |  16 +--
 tp/t/results/xml_tests/spaces_info_lost.pl         |   4 +-
 tp/t/results/xml_tests/top_node_and_bye.pl         |   2 +-
 tp/t/results/xml_tests/top_node_no_section.pl      |   2 +-
 tp/t/results/xtable/accent_on_table_line.pl        |  14 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  22 +--
 .../xtable/comment_and_itemx_before_item.pl        |   2 +-
 .../results/xtable/definfoenclose_on_table_line.pl |   2 +-
 tp/t/results/xtable/empty_item_itemx.pl            |   2 +-
 tp/t/results/xtable/empty_table.pl                 |   2 +-
 tp/t/results/xtable/headitem_in_table.pl           |   2 +-
 .../xtable/index_command_before_end_table.pl       |   2 +-
 .../results/xtable/inter_item_commands_in_table.pl |  32 ++---
 .../inter_item_commands_in_table_in_example.pl     |   4 +-
 .../xtable/invalid_command_and_brace_in_table.pl   |   2 +-
 tp/t/results/xtable/item_index_transformation.pl   |  12 +-
 tp/t/results/xtable/itemx_before_item.pl           |   2 +-
 tp/t/results/xtable/long_item.pl                   |   2 +-
 .../xtable/no_arg_brace_command_on_table_line.pl   |   2 +-
 tp/t/results/xtable/no_argument_for_table.pl       |   2 +-
 tp/t/results/xtable/table_nested.pl                |  22 +--
 tp/t/results/xtable/text_between_item_itemx.pl     |   2 +-
 tp/t/results/xtable/title_and_itemx_before_item.pl |   2 +-
 1374 files changed, 6293 insertions(+), 6273 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a145647ed6..8bd621b59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2024-11-24  Patrice Dumas  <pertusus@free.fr>
+
+       rename argument type as arguments_line
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
+       (_handle_line_command, _handle_block_command),
+       tp/Texinfo/Structuring.pm (new_block_command),
+       tp/Texinfo/Transformations.pm (_new_node),
+       tp/Texinfo/XS/main/element_types.txt,
+       tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command)
+       (handle_block_command), tp/Texinfo/XS/parsetexi/macro.c
+       (parse_macro_command_line),
+       tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command),
+       tp/Texinfo/XS/structuring_transfo/transformations.c
+       (fill_gaps_in_sectioning, new_node): rename argument type as
+       arguments_line.  Update users.
+
 2024-11-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line): reorganize
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index f957fa26a0..808b7a0dce 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1395,7 +1395,7 @@ sub is_content_empty($;$)
       }
     }
     next if ($content->{'type'}
-             and $content->{'type'} eq 'argument');
+             and $content->{'type'} eq 'arguments_line');
     if ($content->{'cmdname'}) {
       if ($content->{'type'} and $content->{'type'} eq 'index_entry_command') {
         if ($do_not_ignore_index_entries) {
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 152e863032..6eec2e365a 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1343,7 +1343,7 @@ sub format_comment_or_return_end_line($$)
   my $line_arg;
   if ($element->{'contents'}
       and $element->{'contents'}->[0]->{'type'}
-      and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+      and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
     $line_arg = $element->{'contents'}->[0]->{'contents'}->[-1];
   } elsif ($element->{'contents'}) {
     $line_arg = $element->{'contents'}->[-1];
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 97614d9e5c..78364e15c4 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -232,7 +232,7 @@ foreach my $type (
             'postamble_after_end',
             'preamble_before_beginning',
             'preamble_before_setfilename',
-            'spaces_at_end', 'argument',
+            'spaces_at_end', 'arguments_line',
   ) {
   $ignored_types{$type} = 1;
 }
@@ -701,7 +701,7 @@ sub _convert_argument_and_end_line($$)
 
   my $line_arg;
   if ($element->{'contents'}->[0]->{'type'}
-      and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+      and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
     $line_arg = $element->{'contents'}->[0]->{'contents'}->[-1];
   } else {
     $line_arg = $element->{'contents'}->[-1];
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 6921dde510..cc942e4a22 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6864,7 +6864,7 @@ foreach my $type ('ignorable_spaces_after_command', 
'postamble_after_end',
             'preamble_before_setfilename',
             'spaces_at_end',
             'spaces_before_paragraph',
-            'spaces_after_close_brace', 'argument') {
+            'spaces_after_close_brace', 'arguments_line') {
   $default_types_conversion{$type} = undef;
 }
 
@@ -13605,7 +13605,7 @@ sub _convert($$;$)
         my $arguments_list;
         if ($element->{'contents'}
             and $element->{'contents'}->[0]->{'type'}
-            and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+            and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
           $arguments_list = $element->{'contents'}->[0]->{'contents'};
         } else {
           $arguments_list = $element->{'contents'};
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index e55afb6ec9..3b96219a94 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -568,7 +568,7 @@ foreach my $type ('ignorable_spaces_after_command',
 
 my %ignored_types;
 foreach my $type ('postamble_after_end', 'preamble_before_beginning',
-            'preamble_before_setfilename', 'argument') {
+            'preamble_before_setfilename', 'arguments_line') {
   $ignored_types{$type} = 1;
 }
 
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 229497ba98..8c8e679b12 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -293,7 +293,7 @@ foreach my $type ('ignorable_spaces_after_command',
 my %ignored_types;
 foreach my $type ('postamble_after_end',
             'preamble_before_beginning',
-            'preamble_before_setfilename', 'argument') {
+            'preamble_before_setfilename', 'arguments_line') {
   $ignored_types{$type} = 1;
 }
 
@@ -1291,7 +1291,7 @@ sub process_footnotes($;$)
                'contents' => [$label_element, {'text' => '-Footnotes'}]};
       my $footnotes_node = {
         'cmdname' => 'node',
-        'contents' => [{'type' => 'argument',
+        'contents' => [{'type' => 'arguments_line',
                         'contents' => [$footnotes_node_arg],}],
         'extra' => {'is_target' => 1,
                 'normalized'
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 9d5002ba99..1ca18892b8 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -218,7 +218,8 @@ sub _convert_to_texinfo($)
 
   return '' if (($element->{'info'}
                  and $element->{'info'}->{'inserted'})
-                or ($element->{'type'} and $element->{'type'} eq 'argument'));
+                or ($element->{'type'}
+                    and $element->{'type'} eq 'arguments_line'));
 
   if (defined($element->{'text'})) {
     $result .= $element->{'text'};
@@ -256,7 +257,7 @@ sub _convert_to_texinfo($)
         return $result if (!$element->{'contents'});
       } elsif ($element->{'contents'}
           and ($element->{'contents'}->[0]->{'type'}
-               and $element->{'contents'}->[0]->{'type'} eq 'argument')) {
+               and $element->{'contents'}->[0]->{'type'} eq 'arguments_line')) 
{
         # root commands and block commands that are not def commands
         $result .= $spc_before_arg;
         $result .= _convert_args($element->{'contents'}->[0]);
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index d3f79c1c7e..d6bf90fd1b 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -466,7 +466,7 @@ sub _end_line_spaces
   my $end_spaces = '';
   my $arguments_list;
   if ($element->{'contents'}->[0]->{'type'}
-      and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+      and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
     $arguments_list = $element->{'contents'}->[0]->{'contents'};
   } else {
     $arguments_list = $element->{'contents'};
@@ -570,7 +570,7 @@ sub _convert_argument_and_end_line($$)
 
   my $line_arg;
   if ($element->{'contents'}->[0]->{'type'}
-      and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+      and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
     $line_arg = $element->{'contents'}->[0]->{'contents'}->[-1];
   } else {
     $line_arg = $element->{'contents'}->[-1];
@@ -1436,7 +1436,7 @@ sub _convert($$;$)
         my $arguments_list;
         if ($element->{'contents'} and scalar(@{$element->{'contents'}})
             and $element->{'contents'}->[0]->{'type'}
-            and $element->{'contents'}->[0]->{'type'} eq 'argument') {
+            and $element->{'contents'}->[0]->{'type'} eq 'arguments_line') {
           $arguments_list = $element->{'contents'}->[0]->{'contents'};
         }
         if ($arguments_list) {
@@ -1606,7 +1606,7 @@ sub _convert($$;$)
   }
   if ($element->{'type'}) {
 
-    if ($element->{'type'} eq 'argument'
+    if ($element->{'type'} eq 'arguments_line'
         or ($container_ignored_if_empty{$element->{'type'}}
             and !$element->{'contents'})) {
       return $result;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 7476717201..62fb6ba0c8 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -120,7 +120,7 @@ my %line_commands = %Texinfo::Commands::line_commands;
 
 my %ignored_types;
 foreach my $type ('postamble_after_end',
-            'preamble_before_beginning', 'argument') {
+            'preamble_before_beginning', 'arguments_line') {
   $ignored_types{$type} = 1;
 }
 
diff --git a/tp/Texinfo/Convert/TextContent.pm 
b/tp/Texinfo/Convert/TextContent.pm
index 539e532659..7d8693952e 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -134,7 +134,7 @@ sub _convert($$)
 
   return '' if (!($element->{'type'} and $element->{'type'} eq 'def_line')
      and (($element->{'type'} and $ignored_types{$element->{'type'}})
-          or ($element->{'type'} and $element->{'type'} eq 'argument'
+          or ($element->{'type'} and $element->{'type'} eq 'arguments_line'
               and $Texinfo::Commands::blockitem_commands{
                                 $element->{'parent'}->{'cmdname'}})
           or ($element->{'cmdname'}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index dbd13544e4..45199ea39a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1316,11 +1316,11 @@ sub _parse_macro_command_line($$$$$;$)
 
   my $macro = { 'cmdname' => $command, 'parent' => $parent,
                 'source_info' => $source_info };
-  my $argument = {'type' => 'argument', 'parent' => $macro};
-  $macro->{'contents'} = [$argument];
+  my $arguments = {'type' => 'arguments_line', 'parent' => $macro};
+  $macro->{'contents'} = [$arguments];
   my $macro_line = {'type' => 'macro_line', 'text' => $line,
-                    'parent' => $argument};
-  $argument->{'contents'} = [$macro_line];
+                    'parent' => $arguments};
+  $arguments->{'contents'} = [$macro_line];
 
   # REMACRO
   my $macro_name;
@@ -1963,7 +1963,7 @@ sub _gather_def_item($$;$)
   # For @defline at the beginning of @defblock.
   return if scalar($contents_count == 1
                    and $current->{'contents'}->[0]->{'type'}
-                   and $current->{'contents'}->[0]->{'type'} eq 'argument');
+            and $current->{'contents'}->[0]->{'type'} eq 'arguments_line');
 
   my $def_item = {'type' => $type,
                   'parent' => $current,
@@ -1974,7 +1974,7 @@ sub _gather_def_item($$;$)
     if (($current->{'contents'}->[-1]->{'extra'}
          and $current->{'contents'}->[-1]->{'extra'}->{'def_command'})
         or ($current->{'contents'}->[-1]->{'type'}
-            and $current->{'contents'}->[-1]->{'type'} eq 'argument')) {
+            and $current->{'contents'}->[-1]->{'type'} eq 'arguments_line')) {
       last;
     } else {
       my $item_content = _pop_element_from_contents($self, $current);
@@ -3660,7 +3660,7 @@ sub _end_line_misc_line($$$)
   my $command_element;
   my $line_arg;
   if ($current->{'parent'}->{'type'}
-      and $current->{'parent'}->{'type'} eq 'argument') {
+      and $current->{'parent'}->{'type'} eq 'arguments_line') {
     $command_element = $current->{'parent'}->{'parent'};
     $line_arg = $command_element->{'contents'}->[0]->{'contents'}->[0];
   } else {
@@ -4260,7 +4260,7 @@ sub _end_line_starting_block($$$)
     }
   }
   $current = $current->{'parent'};
-  if ($current->{'type'} and $current->{'type'} eq 'argument') {
+  if ($current->{'type'} and $current->{'type'} eq 'arguments_line') {
     $current = $current->{'parent'};
   }
   delete $current->{'remaining_args'};
@@ -5067,7 +5067,7 @@ sub _check_valid_nesting {
   if ($current->{'parent'}) {
     my $parent_command;
     if ($current->{'parent'}->{'type'}
-        and $current->{'parent'}->{'type'} eq 'argument') {
+        and $current->{'parent'}->{'type'} eq 'arguments_line') {
       $parent_command = $current->{'parent'}->{'parent'};
     } else {
       $parent_command = $current->{'parent'};
@@ -5665,7 +5665,7 @@ sub _handle_other_command($$$$$)
           push @{$parent->{'contents'}}, $row;
           # Note that the "row_number" extra value
           # isn't actually used anywhere at present.
-          # -2 because of the 'argument'
+          # -2 because of the 'arguments_line'
           $row->{'extra'}
               = {'row_number' => scalar(@{$parent->{'contents'}}) - 2};
           $command_e = { 'cmdname' => $command,
@@ -5978,10 +5978,10 @@ sub _handle_line_command($$$$$$)
     }
     $current = $current->{'contents'}->[-1];
     if ($root_commands{$data_cmdname}) {
-      my $argument = {'type' => 'argument', 'parent' => $current};
-      $current->{'contents'} = [$argument];
-      $argument->{'contents'} = [{ 'type' => 'line_arg',
-                                  'parent' => $argument }];
+      my $arguments = {'type' => 'arguments_line', 'parent' => $current};
+      $current->{'contents'} = [$arguments];
+      $arguments->{'contents'} = [{ 'type' => 'line_arg',
+                                  'parent' => $arguments }];
     } else {# def or line command
       $current->{'contents'} = [{ 'type' => 'line_arg',
                                   'parent' => $current }];
@@ -6203,16 +6203,14 @@ sub _handle_block_command($$$$$)
   my $bla_element;
 
   if (!$def_commands{$command}) {
-    my $argument = {'type' => 'argument', 'parent' => $block_line_e};
-    $block_line_e->{'contents'} = [$argument];
-    $bla_element = {
-                 'type' => 'block_line_arg',
-                 'parent' => $argument};
-    $argument->{'contents'} = [$bla_element];
+    my $arguments = {'type' => 'arguments_line', 'parent' => $block_line_e};
+    $block_line_e->{'contents'} = [$arguments];
+    $bla_element = {'type' => 'block_line_arg',
+                    'parent' => $arguments};
+    $arguments->{'contents'} = [$bla_element];
   } else {
-    $bla_element = {
-                 'type' => 'block_line_arg',
-                 'parent' => $block_line_e};
+    $bla_element = {'type' => 'block_line_arg',
+                    'parent' => $block_line_e};
 
     $block_line_e->{'contents'} = [$bla_element];
   }
@@ -6722,7 +6720,7 @@ sub _handle_comma($$$$)
   #                          and $type ne 'line_arg');
   my $command_element;
   my $argument = $current->{'parent'};
-  if ($argument->{'type'} and $argument->{'type'} eq 'argument') {
+  if ($argument->{'type'} and $argument->{'type'} eq 'arguments_line') {
     $command_element = $argument->{'parent'};
   } else {
     $command_element = $current->{'parent'};
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 8f09c083ff..9c012cbd0f 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1286,11 +1286,12 @@ sub new_block_command($$)
 
   $element->{'cmdname'} = $command_name;
 
-  my $argument = {'type' => 'argument', 'parent' => $element};
-  $argument->{'contents'} = [{'type' => 'block_line_arg', 'parent' => 
$argument,
-                           'info' => { 'spaces_after_argument' =>
-                                        {'text' => "\n",}}}];
-  unshift @{$element->{'contents'}}, $argument;
+  my $arguments = {'type' => 'arguments_line', 'parent' => $element};
+  $arguments->{'contents'} = [{'type' => 'block_line_arg',
+                               'parent' => $arguments,
+                                'info' => { 'spaces_after_argument' =>
+                                               {'text' => "\n",}}}];
+  unshift @{$element->{'contents'}}, $arguments;
 
   my $end = {'cmdname' => 'end', 'parent' => $element,
              'extra' => {'text_arg' => $command_name}};
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 83e6be33d9..d1052383e5 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -172,12 +172,12 @@ sub fill_gaps_in_sectioning($;$)
         };
         $new_section->{'info'} = {'spaces_before_argument' =>
                                               {'text' => ' ',}};
-        my $argument = {'type' => 'argument', 'parent' => $new_section};
+        my $arguments = {'type' => 'arguments_line', 'parent' => $new_section};
 
-        my $line_arg = {'type' => 'line_arg', 'parent' => $argument,
+        my $line_arg = {'type' => 'line_arg', 'parent' => $arguments,
                         'info' => {'spaces_after_argument'
                                                  => {'text' => "\n",}}};
-        $argument->{'contents'} = [$line_arg];
+        $arguments->{'contents'} = [$line_arg];
 
         my $line_content;
         if ($commands_heading_content) {
@@ -193,7 +193,7 @@ sub fill_gaps_in_sectioning($;$)
           $line_content = $asis_command;
         }
         $line_arg->{'contents'} = [$line_content];
-        $new_section->{'contents'} = [$argument,
+        $new_section->{'contents'} = [$arguments,
                                       {'type' => 'empty_line',
                                        'text' => "\n",
                                        'parent' => $new_section}];
@@ -377,7 +377,7 @@ sub _new_node($$;$)
     $node = {'cmdname' => 'node', 'extra' => {}};
     $node->{'info'} = {'spaces_before_argument' => {'text' => ' '}};
 
-    my $argument = {'type' => 'argument', 'parent' => $node};
+    my $argument = {'type' => 'arguments_line', 'parent' => $node};
     $node->{'contents'} = [$argument];
 
     my $node_line_arg = {'type' => 'line_arg', 'parent' => $argument};
@@ -872,7 +872,7 @@ sub _protect_hashchar_at_line_beginning($$$)
         # protect if first in container, or if after a newline
         if ($i == 0
             or ($i == 1 and $parent->{'contents'}->[0]->{'type'}
-                and $parent->{'contents'}->[0]->{'type'} eq 'argument')
+                and $parent->{'contents'}->[0]->{'type'} eq 'arguments_line')
             or ($parent->{'contents'}->[$i-1]->{'text'}
                 and $parent->{'contents'}->[$i-1]->{'text'} =~ /\n$/)) {
           # do not actually protect in raw block command, but warn
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 3510e06044..033aea55d4 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -1344,7 +1344,7 @@ html_convert_tree_append (CONVERTER *self, const ELEMENT 
*element,
               const ELEMENT_LIST *arguments_list = 0;
 
               if (element->e.c->contents.number > 0
-                       && element->e.c->contents.list[0]->type == ET_argument)
+                  && element->e.c->contents.list[0]->type == ET_arguments_line)
                 {
                   const ELEMENT *argument = element->e.c->contents.list[0];
                   /* TODO most likely always true */
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.c 
b/tp/Texinfo/XS/convert/html_prepare_converter.c
index 978776b7c8..293e502cc0 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.c
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.c
@@ -188,7 +188,7 @@ static enum element_type ignored_types[] = {
     ET_spaces_at_end,
     ET_spaces_before_paragraph,
     ET_spaces_after_close_brace,
-    ET_argument, 0
+    ET_arguments_line, 0
 };
 
 HTML_COMMAND_STRUCT html_commands_data[BUILTIN_CMD_NUMBER];
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 0dca3e96b3..b0c6f624d0 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -66,7 +66,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
 {
   const ELEMENT *elt;
 
-  if (e->flags & EF_inserted || e->type == ET_argument)
+  if (e->flags & EF_inserted || e->type == ET_arguments_line)
     {}
   else if (type_data[e->type].flags & TF_text)
     {
@@ -108,15 +108,17 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT 
*result)
                 return;
             }
           else if (e->e.c->contents.number > 0
-                   && e->e.c->contents.list[0]->type == ET_argument)
+                   && e->e.c->contents.list[0]->type == ET_arguments_line)
             {
            /* root commands and block commands that are not def commands */
-              const ELEMENT *argument = e->e.c->contents.list[0];
+              const ELEMENT *arguments = e->e.c->contents.list[0];
 
               if (spc_before_arg)
                 ADD((char *)spc_before_arg->e.text->text);
 
-              convert_args (argument, result);
+           /* used for @macro too, in that case the whole line is the
+              only argument, there is no separation by commas */
+              convert_args (arguments, result);
             }
       /* arg_line set for line_commands with type lineraw that have
          arguments and for @macro. */
diff --git a/tp/Texinfo/XS/main/convert_to_text.c 
b/tp/Texinfo/XS/main/convert_to_text.c
index 9d1caa3d73..065f494d88 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -625,7 +625,7 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
       || data_cmd == CM_seealso
       || element->type == ET_postamble_after_end
       || element->type == ET_preamble_before_beginning
-      || element->type == ET_argument)
+      || element->type == ET_arguments_line)
     return;
 
   if (data_cmd
diff --git a/tp/Texinfo/XS/main/element_types.c 
b/tp/Texinfo/XS/main/element_types.c
index 7dff572265..85459957a4 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -38,9 +38,9 @@ TYPE_DATA type_data[] = {
 {"paragraph", 0, 0},
 {"preformatted", 0, 0},
 {"rawpreformatted", 0, 0},
-{"argument", 0, 0},
-{"brace_container", 0, 0},
+{"arguments_line", 0, 0},
 {"brace_command_context", 0, 0},
+{"brace_container", 0, 0},
 {"brace_arg", 0, 3},
 {"block_line_arg", 0, 4},
 {"line_arg", 0, 4},
diff --git a/tp/Texinfo/XS/main/element_types.h 
b/tp/Texinfo/XS/main/element_types.h
index f1791c5ff4..e26dbd8c79 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -37,9 +37,9 @@ ET_preamble_before_content,
 ET_paragraph,
 ET_preformatted,
 ET_rawpreformatted,
-ET_argument,
-ET_brace_container,
+ET_arguments_line,
 ET_brace_command_context,
+ET_brace_container,
 ET_brace_arg,
 ET_block_line_arg,
 ET_line_arg,
diff --git a/tp/Texinfo/XS/main/element_types.txt 
b/tp/Texinfo/XS/main/element_types.txt
index 54eca60f2c..f5cdec6e14 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -93,9 +93,10 @@ preformatted
 rawpreformatted
 
 # @-commands arguments containers
-argument
-brace_container
+arguments_line
 brace_command_context
+# @-commands containers for one argument content
+brace_container
 # with separate leading spaces in info, and trailing (if not in inline)
 brace_arg                                  spaces_before,spaces_after
 # with comment_at_end
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 8a4a49bc3a..161ce6b782 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -1614,7 +1614,7 @@ is_content_empty (const ELEMENT *tree, int 
do_not_ignore_index_entries)
             }
         }
 
-      if (content->type == ET_argument)
+      if (content->type == ET_arguments_line)
         continue;
 
       data_cmd = element_builtin_data_cmd (content);
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index ede4dd69dd..997c1e56a9 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -59,7 +59,7 @@ gather_def_item (ELEMENT *current, enum command_id 
next_command)
   contents_count = current->e.c->contents.number;
   /* For @defline at the beginning of @defblock. */
   if (contents_count == 1
-      && current->e.c->contents.list[0]->type == ET_argument)
+      && current->e.c->contents.list[0]->type == ET_arguments_line)
     return;
 
   /* Starting from the end, determine the number of elements that are not
@@ -68,7 +68,7 @@ gather_def_item (ELEMENT *current, enum command_id 
next_command)
     {
       ELEMENT *last_child = contents_child_by_index (current, pos -1);
       if (last_child->flags & EF_def_line
-          || last_child->type == ET_argument)
+          || last_child->type == ET_arguments_line)
         break;
     }
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 65548e9a05..dff763852c 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -887,7 +887,7 @@ end_line_starting_block (ELEMENT *current)
     }
 
   current = current->parent;
-  if (current->type == ET_argument)
+  if (current->type == ET_arguments_line)
     current = current->parent;
   if (counter_value (&count_remaining_args, current) != -1)
     counter_pop (&count_remaining_args);
@@ -1242,7 +1242,7 @@ end_line_misc_line (ELEMENT *current)
   ELEMENT *command_element;
   ELEMENT *line_arg = 0;
 
-  if (current->parent->type == ET_argument)
+  if (current->parent->type == ET_arguments_line)
     {
       command_element = current->parent->parent;
       line_arg = command_element->e.c->contents.list[0]->e.c->contents.list[0];
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index f09bd1dc18..dea84871e2 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -928,9 +928,9 @@ handle_line_command (ELEMENT *current, const char 
**line_inout,
 
       if (command_data(data_cmd).flags & CF_root)
         {
-          ELEMENT *argument = new_element (ET_argument);
-          add_to_element_contents (current, argument);
-          add_to_element_contents (argument, arg);
+          ELEMENT *arguments = new_element (ET_arguments_line);
+          add_to_element_contents (current, arguments);
+          add_to_element_contents (arguments, arg);
         }
       else /* def or line command */
         add_to_element_contents (current, arg);
@@ -1173,9 +1173,9 @@ handle_block_command (ELEMENT *current, const char 
**line_inout,
   bla_element = new_element (ET_block_line_arg);
   if (!(command_data(cmd).flags & CF_def))
     {
-      ELEMENT *argument = new_element (ET_argument);
-      add_to_element_contents (block_line_e, argument);
-      add_to_element_contents (argument, bla_element);
+      ELEMENT *arguments = new_element (ET_arguments_line);
+      add_to_element_contents (block_line_e, arguments);
+      add_to_element_contents (arguments, bla_element);
     }
   else
     {
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index 430c9b4e61..944edab45f 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -133,7 +133,7 @@ parse_macro_command_line (enum command_id cmd, const char 
**line_inout,
 {
   const char *line = *line_inout;
   const char *pline = line;
-  ELEMENT *macro, *argument, *macro_line;
+  ELEMENT *macro, *arguments, *macro_line;
   char *name;
   const char *args_ptr;
   STRING_LIST *formal_args;
@@ -143,12 +143,12 @@ parse_macro_command_line (enum command_id cmd, const char 
**line_inout,
   macro = new_command_element (ET_block_command, cmd);
   macro->e.c->source_info = current_source_info;
 
-  argument = new_element (ET_argument);
-  add_to_element_contents (macro, argument);
+  arguments = new_element (ET_arguments_line);
+  add_to_element_contents (macro, arguments);
 
   macro_line = new_text_element (ET_macro_line);
   text_append (macro_line->e.text, line);
-  add_to_element_contents (argument, macro_line);
+  add_to_element_contents (arguments, macro_line);
 
   pline += strspn (pline, whitespace_chars);
   name = read_command_name (&pline);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 722ebc045b..e58982e61a 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1250,7 +1250,7 @@ check_valid_nesting (ELEMENT *current, enum command_id 
cmd)
   enum command_id outer;
   unsigned long outer_flags;
 
-  if (current->parent->type == ET_argument)
+  if (current->parent->type == ET_arguments_line)
     parent_command = current->parent->parent;
   else
     parent_command = current->parent;
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 4d03be1015..9bb61c3c46 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -629,7 +629,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
   type = current->type;
   command_element = current->parent;
   argument = current->parent;
-  if (argument->type == ET_argument)
+  if (argument->type == ET_arguments_line)
     command_element = argument->parent;
   else
     command_element = argument;
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c 
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index b57c242181..318c48348a 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -52,8 +52,8 @@
 void
 new_block_command (ELEMENT *element)
 {
-  ELEMENT *args = new_element (ET_block_line_arg);
-  ELEMENT *argument = new_element (ET_argument);
+  ELEMENT *block_line_arg = new_element (ET_block_line_arg);
+  ELEMENT *arguments = new_element (ET_arguments_line);
   ELEMENT *arg_spaces_after = new_text_element (ET_other_text);
   ELEMENT *end = new_command_element (ET_line_command, CM_end);
   ELEMENT *end_args = new_element (ET_line_arg);
@@ -63,10 +63,10 @@ new_block_command (ELEMENT *element)
   const char *command_name = builtin_command_name (element->e.c->cmd);
 
   text_append (arg_spaces_after->e.text, "\n");
-  args->elt_info[eit_spaces_after_argument] = arg_spaces_after;
-  add_to_element_contents (argument, args);
+  block_line_arg->elt_info[eit_spaces_after_argument] = arg_spaces_after;
+  add_to_element_contents (arguments, block_line_arg);
 
-  insert_into_contents (element, argument, 0);
+  insert_into_contents (element, arguments, 0);
 
   add_extra_string_dup (end, AI_key_text_arg, command_name);
   text_append (end_spaces_before->e.text, " ");
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c 
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index e582e38c6d..3dc6503a33 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -249,7 +249,7 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT 
*commands_heading_content)
               ELEMENT *spaces_before_argument
                  = new_text_element (ET_other_text);
               ELEMENT *line_arg = new_element (ET_line_arg);
-              ELEMENT *argument = new_element (ET_argument);
+              ELEMENT *arguments = new_element (ET_arguments_line);
               ELEMENT *spaces_after_argument = new_text_element 
(ET_other_text);
               ELEMENT *empty_line = new_text_element (ET_empty_line);
 
@@ -262,11 +262,11 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT 
*commands_heading_content)
                              = spaces_before_argument;
               text_append (spaces_after_argument->e.text, "\n");
 
-              add_to_element_contents (new_section, argument);
+              add_to_element_contents (new_section, arguments);
 
               line_arg->elt_info[eit_spaces_after_argument]
                        = spaces_after_argument;
-              add_to_element_contents (argument, line_arg);
+              add_to_element_contents (arguments, line_arg);
 
               if (commands_heading_content)
                 {
@@ -646,14 +646,14 @@ new_node (ERROR_MESSAGE_LIST *error_messages, ELEMENT 
*node_tree,
       char *non_hyphen_char;
       ELEMENT *target = 0;
       ELEMENT *appended_text = 0;
-      ELEMENT *argument = new_element (ET_argument);
+      ELEMENT *arguments = new_element (ET_arguments_line);
       ELEMENT *node_line_arg = new_element (ET_line_arg);
       ELEMENT *spaces_before = new_text_element (ET_other_text);
       ELEMENT *spaces_after = new_text_element (ET_other_text);
 
       node = new_command_element (ET_line_command, CM_node);
-      add_to_element_contents (node, argument);
-      add_to_element_contents (argument, node_line_arg);
+      add_to_element_contents (node, arguments);
+      add_to_element_contents (arguments, node_line_arg);
       text_append (spaces_before->e.text, " ");
       text_append (spaces_after->e.text, spaces_after_argument.text);
       node->elt_info[eit_spaces_before_argument] = spaces_before;
@@ -1356,7 +1356,7 @@ protect_hashchar_at_line_beginning_internal (const char 
*type,
                   int do_protect = 0;
                   if (i == 0
                       || (i == 1
-                        && parent->e.c->contents.list[0]->type == ET_argument))
+                 && parent->e.c->contents.list[0]->type == ET_arguments_line))
                     do_protect = 1;
                   else
                     {
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index 33d9fddc37..1d1c3c226b 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -281,7 +281,7 @@ sub l2h_process($$)
                and $tree->{'contents'}->[0]->{'type'}
                and ($tree->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command'
                    or $tree->{'contents'}->[0]->{'type'} eq 
'elided_rawpreformatted'
-                   or $tree->{'contents'}->[0]->{'type'} eq 'argument')) {
+                   or $tree->{'contents'}->[0]->{'type'} eq 'arguments_line')) 
{
           shift @{$tree->{'contents'}};
         }
         if ($tree->{'contents'}->[-1]->{'cmdname'}
diff --git a/tp/ext/tex4ht.pm b/tp/ext/tex4ht.pm
index dba5a65b37..684f144d6d 100644
--- a/tp/ext/tex4ht.pm
+++ b/tp/ext/tex4ht.pm
@@ -228,7 +228,7 @@ sub tex4ht_prepare($$)
               and ($tree->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command'
                    or $tree->{'contents'}->[0]->{'type'} eq 
'elided_brace_command_arg'
                    or $tree->{'contents'}->[0]->{'type'} eq 
'elided_rawpreformatted'
-                   or $tree->{'contents'}->[0]->{'type'} eq 'argument')) {
+                   or $tree->{'contents'}->[0]->{'type'} eq 'arguments_line')) 
{
             shift @{$tree->{'contents'}};
           }
           if ($tree->{'contents'}->[-1]->{'cmdname'}
diff --git a/tp/t/01use.t b/tp/t/01use.t
index 239571d62a..cb2600b582 100644
--- a/tp/t/01use.t
+++ b/tp/t/01use.t
@@ -21,7 +21,7 @@ my $manual_tree = { 'cmdname' => 'multitable',
     },
   },
   'contents' => [
-     {'type' => 'argument',
+     {'type' => 'arguments_line',
       'contents' => [
         { 'type' => 'block_line_arg',
           'info' => {
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl 
b/tp/t/results/alias/alias_macro_target_removed.pl
index 8134f7d3c2..51205ac492 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -20,7 +20,7 @@ $result_trees{'alias_macro_target_removed'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
diff --git a/tp/t/results/alias/alias_of_added_index.pl 
b/tp/t/results/alias/alias_of_added_index.pl
index 386d8340a3..480646c065 100644
--- a/tp/t/results/alias/alias_of_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index.pl
@@ -107,7 +107,7 @@ $result_trees{'alias_of_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -143,7 +143,7 @@ $result_trees{'alias_of_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -223,7 +223,7 @@ $result_trees{'alias_of_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -260,7 +260,7 @@ $result_trees{'alias_of_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/alias/alias_of_added_index_before_added_index.pl 
b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
index b257f43bde..fa448367e4 100644
--- a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -107,7 +107,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -143,7 +143,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -223,7 +223,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -260,7 +260,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/alias/alias_of_macro.pl 
b/tp/t/results/alias/alias_of_macro.pl
index 1839f7b146..d4ae8be587 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'alias_of_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '||\\thearg||
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl 
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index 9ac796e9df..d65455873c 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -58,7 +58,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '||\\thearg||
diff --git a/tp/t/results/alias/alias_table_command.pl 
b/tp/t/results/alias/alias_table_command.pl
index f11ace9720..92f94d11b5 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -73,7 +73,7 @@ $result_trees{'alias_table_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/alias/block_command_alias.pl 
b/tp/t/results/alias/block_command_alias.pl
index 11a7f475ce..2ae68e132d 100644
--- a/tp/t/results/alias/block_command_alias.pl
+++ b/tp/t/results/alias/block_command_alias.pl
@@ -62,7 +62,7 @@ $result_trees{'block_command_alias'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/alias/texinfo_command_alias.pl 
b/tp/t/results/alias/texinfo_command_alias.pl
index db514479d6..cf388aaded 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -20,7 +20,7 @@ $result_trees{'texinfo_command_alias'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index 0636809837..1411cd23a1 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -20,7 +20,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
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 dff2c3f1cd..fa4fe6669f 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -20,7 +20,7 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
diff --git a/tp/t/results/columnfractions/empty.pl 
b/tp/t/results/columnfractions/empty.pl
index ca49768d49..5f003aea94 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -37,7 +37,7 @@ $result_trees{'empty'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index 02e118dfc6..f5771083d9 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -48,7 +48,7 @@ $result_trees{'empty_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/good.pl 
b/tp/t/results/columnfractions/good.pl
index 8e542a3f27..786dbc7eb9 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -54,7 +54,7 @@ $result_trees{'good'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index 3b04ace049..e6bb9b629d 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -60,7 +60,7 @@ $result_trees{'good_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index cfe5f9b84c..f18ccc536b 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -62,7 +62,7 @@ $result_trees{'good_space_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/invalid.pl 
b/tp/t/results/columnfractions/invalid.pl
index 4ebfe41005..e5816f1c57 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -47,7 +47,7 @@ $result_trees{'invalid'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/not_fraction.pl 
b/tp/t/results/columnfractions/not_fraction.pl
index c995594388..dc77ebe9d3 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -47,7 +47,7 @@ $result_trees{'not_fraction'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl 
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index 81327af571..d1facb120c 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -56,7 +56,7 @@ $result_trees{'something_before_columnfractions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index f995d4ef9d..7c20c78491 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -60,7 +60,7 @@ $result_trees{'wrong_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/conditionals/additional_space_in_end_conditional.pl 
b/tp/t/results/conditionals/additional_space_in_end_conditional.pl
index 2af2e4d70c..0f2e4479f8 100644
--- a/tp/t/results/conditionals/additional_space_in_end_conditional.pl
+++ b/tp/t/results/conditionals/additional_space_in_end_conditional.pl
@@ -28,7 +28,7 @@ $result_trees{'additional_space_in_end_conditional'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'not html
diff --git 
a/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl 
b/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
index a6da3666d9..285662b0ba 100644
--- a/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
+++ b/tp/t/results/conditionals/additional_space_in_end_conditional_expanded.pl
@@ -28,7 +28,7 @@ $result_trees{'additional_space_in_end_conditional_expanded'} 
= {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/bad_ifclear_argument.pl 
b/tp/t/results/conditionals/bad_ifclear_argument.pl
index bd2561cbb9..a71fae7acc 100644
--- a/tp/t/results/conditionals/bad_ifclear_argument.pl
+++ b/tp/t/results/conditionals/bad_ifclear_argument.pl
@@ -33,7 +33,7 @@ $result_trees{'bad_ifclear_argument'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'R#something
diff --git a/tp/t/results/conditionals/bad_ifset_argument.pl 
b/tp/t/results/conditionals/bad_ifset_argument.pl
index 23f9f56ecd..0c38f5c91e 100644
--- a/tp/t/results/conditionals/bad_ifset_argument.pl
+++ b/tp/t/results/conditionals/bad_ifset_argument.pl
@@ -33,7 +33,7 @@ $result_trees{'bad_ifset_argument'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'Ra&b
diff --git a/tp/t/results/conditionals/command_conditionals.pl 
b/tp/t/results/conditionals/command_conditionals.pl
index 2c725ec346..f4d2dc7fd0 100644
--- a/tp/t/results/conditionals/command_conditionals.pl
+++ b/tp/t/results/conditionals/command_conditionals.pl
@@ -33,7 +33,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -122,7 +122,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'Bad, @@nodexyz is defined.
@@ -194,7 +194,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -292,7 +292,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -381,7 +381,7 @@ $result_trees{'command_conditionals'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'Bad, @@node is not defined.
@@ -462,7 +462,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'Unfortunately, @@mathcode is defined.
@@ -534,7 +534,7 @@ $result_trees{'command_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl 
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index b346ac5a18..6aa64b88be 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -20,7 +20,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'machin
@@ -204,7 +204,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -290,7 +290,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@@macro truc is wrongly not defined
@@ -371,7 +371,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -460,7 +460,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'index command @@authindex is wrongly not 
defined
@@ -541,7 +541,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -630,7 +630,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'definfoenclose @@infoencl is wrongly not 
defined
@@ -711,7 +711,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -800,7 +800,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'strongalias @@alias is wrongly not defined
diff --git a/tp/t/results/conditionals/commands_in_ifset.pl 
b/tp/t/results/conditionals/commands_in_ifset.pl
index 251641d99b..6bf0939562 100644
--- a/tp/t/results/conditionals/commands_in_ifset.pl
+++ b/tp/t/results/conditionals/commands_in_ifset.pl
@@ -33,7 +33,7 @@ $result_trees{'commands_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@definfoenclose
@@ -127,7 +127,7 @@ $result_trees{'commands_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@example
diff --git a/tp/t/results/conditionals/comment_on_ifset_line.pl 
b/tp/t/results/conditionals/comment_on_ifset_line.pl
index 6cde48f26b..261da7aea7 100644
--- a/tp/t/results/conditionals/comment_on_ifset_line.pl
+++ b/tp/t/results/conditionals/comment_on_ifset_line.pl
@@ -56,7 +56,7 @@ $result_trees{'comment_on_ifset_line'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -145,7 +145,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -231,7 +231,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -320,7 +320,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -409,7 +409,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -498,7 +498,7 @@ $result_trees{'comment_on_ifset_line'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
diff --git a/tp/t/results/conditionals/cond.pl 
b/tp/t/results/conditionals/cond.pl
index aaae90ec69..6f616404c4 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -56,7 +56,7 @@ $result_trees{'cond'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'cond'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'This is ifhtml text.
@@ -195,7 +195,7 @@ $result_trees{'cond'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'cond'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'cond'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'cond'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -393,7 +393,7 @@ $result_trees{'cond'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifinfo text.
@@ -464,7 +464,7 @@ $result_trees{'cond'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -554,7 +554,7 @@ $result_trees{'cond'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -622,7 +622,7 @@ $result_trees{'cond'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -693,7 +693,7 @@ $result_trees{'cond'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index ee4cbf53f1..11269b5930 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -123,7 +123,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -210,7 +210,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnothtml text.
@@ -290,7 +290,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -327,7 +327,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -366,7 +366,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -392,7 +392,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -476,7 +476,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnotinfo text.
@@ -553,7 +553,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -621,7 +621,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -692,7 +692,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index 2d485ab391..aa7e68d9dc 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -123,7 +123,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -210,7 +210,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnothtml text.
@@ -290,7 +290,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -327,7 +327,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -366,7 +366,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -392,7 +392,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -476,7 +476,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnotinfo text.
@@ -553,7 +553,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -620,7 +620,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -704,7 +704,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnottex text.
diff --git a/tp/t/results/conditionals/cond_info.pl 
b/tp/t/results/conditionals/cond_info.pl
index 5f54a9b2ab..6987a5cdf0 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_info'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'cond_info'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'This is ifhtml text.
@@ -195,7 +195,7 @@ $result_trees{'cond_info'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'cond_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'cond_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'cond_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -393,7 +393,7 @@ $result_trees{'cond_info'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -477,7 +477,7 @@ $result_trees{'cond_info'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnotinfo text.
@@ -554,7 +554,7 @@ $result_trees{'cond_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -622,7 +622,7 @@ $result_trees{'cond_info'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -693,7 +693,7 @@ $result_trees{'cond_info'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index 455ebf8063..f9d9df387e 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -123,7 +123,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -210,7 +210,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnothtml text.
@@ -290,7 +290,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -327,7 +327,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -366,7 +366,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -392,7 +392,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -476,7 +476,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnotinfo text.
@@ -553,7 +553,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -620,7 +620,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -704,7 +704,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnottex text.
diff --git 
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index d582b13268..b833643f3a 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'This is ifhtml text.
@@ -195,7 +195,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -393,7 +393,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifinfo text.
@@ -464,7 +464,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -554,7 +554,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -622,7 +622,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -693,7 +693,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index c9e8877c77..7d2aedde63 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'This is ifhtml text.
@@ -195,7 +195,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -393,7 +393,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifinfo text.
@@ -464,7 +464,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -554,7 +554,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -622,7 +622,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -693,7 +693,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/cond_xml.pl 
b/tp/t/results/conditionals/cond_xml.pl
index 7a1f2eb361..db65629fba 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -56,7 +56,7 @@ $result_trees{'cond_xml'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'cond_xml'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'This is ifhtml text.
@@ -195,7 +195,7 @@ $result_trees{'cond_xml'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'cond_xml'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'cond_xml'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'cond_xml'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -393,7 +393,7 @@ $result_trees{'cond_xml'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifinfo text.
@@ -464,7 +464,7 @@ $result_trees{'cond_xml'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -554,7 +554,7 @@ $result_trees{'cond_xml'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -622,7 +622,7 @@ $result_trees{'cond_xml'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -693,7 +693,7 @@ $result_trees{'cond_xml'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/conditional_not_closed.pl 
b/tp/t/results/conditionals/conditional_not_closed.pl
index b5606b7563..b84aaea659 100644
--- a/tp/t/results/conditionals/conditional_not_closed.pl
+++ b/tp/t/results/conditionals/conditional_not_closed.pl
@@ -28,7 +28,7 @@ $result_trees{'conditional_not_closed'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifhtml
diff --git a/tp/t/results/conditionals/consecutive_conditionals.pl 
b/tp/t/results/conditionals/consecutive_conditionals.pl
index 4acb7635ab..7a80cf0c4d 100644
--- a/tp/t/results/conditionals/consecutive_conditionals.pl
+++ b/tp/t/results/conditionals/consecutive_conditionals.pl
@@ -28,7 +28,7 @@ $result_trees{'consecutive_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifinfo
@@ -89,7 +89,7 @@ $result_trees{'consecutive_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in iftex
@@ -182,7 +182,7 @@ $result_trees{'consecutive_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifclear
@@ -254,7 +254,7 @@ $result_trees{'consecutive_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifset
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl 
b/tp/t/results/conditionals/defcondx_Dbar.pl
index 11ecd5d47b..61e57ab24f 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -92,7 +92,7 @@ $result_trees{'defcondx_Dbar'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'defcondx_Dbar'} = {
                                 'type' => 'block_line_arg'
                               }
                             ],
-                            'type' => 'argument'
+                            'type' => 'arguments_line'
                           }
                         ],
                         'info' => {
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl 
b/tp/t/results/conditionals/defcondx_Ubar.pl
index 380f04a7b7..8c071eeb58 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -92,7 +92,7 @@ $result_trees{'defcondx_Ubar'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'defcondx_Ubar'} = {
                                 'type' => 'block_line_arg'
                               }
                             ],
-                            'type' => 'argument'
+                            'type' => 'arguments_line'
                           },
                           {
                             'text' => '@deffnx bar
diff --git a/tp/t/results/conditionals/empty_ifclear.pl 
b/tp/t/results/conditionals/empty_ifclear.pl
index cca684fc52..c8c165babb 100644
--- a/tp/t/results/conditionals/empty_ifclear.pl
+++ b/tp/t/results/conditionals/empty_ifclear.pl
@@ -28,7 +28,7 @@ $result_trees{'empty_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '
diff --git a/tp/t/results/conditionals/empty_ifset.pl 
b/tp/t/results/conditionals/empty_ifset.pl
index 39c7426e41..a964d1945a 100644
--- a/tp/t/results/conditionals/empty_ifset.pl
+++ b/tp/t/results/conditionals/empty_ifset.pl
@@ -28,7 +28,7 @@ $result_trees{'empty_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
index 73a85f2053..1d863ab751 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_no_set.pl
@@ -33,7 +33,7 @@ $result_trees{'empty_ifset_in_ifset_no_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@verbatim
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index c3645fb325..f570166bff 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -55,7 +55,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -91,7 +91,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset
diff --git a/tp/t/results/conditionals/empty_set_in_ifclear.pl 
b/tp/t/results/conditionals/empty_set_in_ifclear.pl
index b278a6d209..4b43957324 100644
--- a/tp/t/results/conditionals/empty_set_in_ifclear.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifclear.pl
@@ -50,7 +50,7 @@ $result_trees{'empty_set_in_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'a is set to:|@value{a}|.
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl 
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index d42dd0df3c..a6ed17cbd9 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -50,7 +50,7 @@ $result_trees{'empty_set_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl 
b/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
index 24aec7ed53..e0f7ff143b 100644
--- a/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
+++ b/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
@@ -28,7 +28,7 @@ $result_trees{'end_conditional_not_at_line_begining'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'inhtml
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index a697ebd715..34ae3e675c 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -55,7 +55,7 @@ $result_trees{'end_ifset_in_format'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -91,7 +91,7 @@ $result_trees{'end_ifset_in_format'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end ifset
@@ -204,7 +204,7 @@ $result_trees{'end_ifset_in_format'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -240,7 +240,7 @@ $result_trees{'end_ifset_in_format'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end ifset
@@ -343,7 +343,7 @@ $result_trees{'end_ifset_in_format'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/conditionals/false_format_not_closed.pl 
b/tp/t/results/conditionals/false_format_not_closed.pl
index 11be9afd8d..45f39ef839 100644
--- a/tp/t/results/conditionals/false_format_not_closed.pl
+++ b/tp/t/results/conditionals/false_format_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'false_format_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/conditionals/if_not_closed.pl 
b/tp/t/results/conditionals/if_not_closed.pl
index abfbd9205b..e197f3d5ac 100644
--- a/tp/t/results/conditionals/if_not_closed.pl
+++ b/tp/t/results/conditionals/if_not_closed.pl
@@ -22,7 +22,7 @@ $result_trees{'if_not_closed'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/ifclear_in_ifset.pl 
b/tp/t/results/conditionals/ifclear_in_ifset.pl
index 5ff126461d..e875a5afa1 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset.pl
@@ -33,7 +33,7 @@ $result_trees{'ifclear_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifclear ok  - ok, ignored
diff --git a/tp/t/results/conditionals/ifclear_in_ifset_set.pl 
b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
index 03703ffa5d..16cfc43e0c 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
@@ -55,7 +55,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -102,7 +102,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/conditionals/ifnot_format_conditional.pl 
b/tp/t/results/conditionals/ifnot_format_conditional.pl
index 3531daf518..92b8f12111 100644
--- a/tp/t/results/conditionals/ifnot_format_conditional.pl
+++ b/tp/t/results/conditionals/ifnot_format_conditional.pl
@@ -28,7 +28,7 @@ $result_trees{'ifnot_format_conditional'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/ifnotinfo_exception.pl 
b/tp/t/results/conditionals/ifnotinfo_exception.pl
index 257e6e4730..31c7b33f58 100644
--- a/tp/t/results/conditionals/ifnotinfo_exception.pl
+++ b/tp/t/results/conditionals/ifnotinfo_exception.pl
@@ -28,7 +28,7 @@ $result_trees{'ifnotinfo_exception'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifnotinfo
diff --git a/tp/t/results/conditionals/ifset_in_command.pl 
b/tp/t/results/conditionals/ifset_in_command.pl
index 66af176ee2..be07cd1cae 100644
--- a/tp/t/results/conditionals/ifset_in_command.pl
+++ b/tp/t/results/conditionals/ifset_in_command.pl
@@ -45,7 +45,7 @@ $result_trees{'ifset_in_command'} = {
                                     'type' => 'block_line_arg'
                                   }
                                 ],
-                                'type' => 'argument'
+                                'type' => 'arguments_line'
                               },
                               {
                                 'text' => 'xset
@@ -117,7 +117,7 @@ $result_trees{'ifset_in_command'} = {
                                     'type' => 'block_line_arg'
                                   }
                                 ],
-                                'type' => 'argument'
+                                'type' => 'arguments_line'
                               }
                             ],
                             'info' => {
diff --git a/tp/t/results/conditionals/ifset_nonalpha.pl 
b/tp/t/results/conditionals/ifset_nonalpha.pl
index 393691b887..85423542cd 100644
--- a/tp/t/results/conditionals/ifset_nonalpha.pl
+++ b/tp/t/results/conditionals/ifset_nonalpha.pl
@@ -33,7 +33,7 @@ $result_trees{'ifset_nonalpha'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'cmdname' => 'end',
diff --git a/tp/t/results/conditionals/ignore_not_closed.pl 
b/tp/t/results/conditionals/ignore_not_closed.pl
index ca80e46096..2e9ea42de0 100644
--- a/tp/t/results/conditionals/ignore_not_closed.pl
+++ b/tp/t/results/conditionals/ignore_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'ignore_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/conditionals/ignore_spaces_and_comments.pl 
b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
index 5882132eea..8d747775d4 100644
--- a/tp/t/results/conditionals/ignore_spaces_and_comments.pl
+++ b/tp/t/results/conditionals/ignore_spaces_and_comments.pl
@@ -24,7 +24,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'No space no comment
@@ -86,7 +86,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Spaces no comment
@@ -154,7 +154,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Comment
@@ -222,7 +222,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Space Comment
@@ -295,7 +295,7 @@ $result_trees{'ignore_spaces_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Space Comment no argument
diff --git a/tp/t/results/conditionals/ignored_in_ifset.pl 
b/tp/t/results/conditionals/ignored_in_ifset.pl
index 2d79390c62..576bae4df7 100644
--- a/tp/t/results/conditionals/ignored_in_ifset.pl
+++ b/tp/t/results/conditionals/ignored_in_ifset.pl
@@ -33,7 +33,7 @@ $result_trees{'ignored_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ignore
@@ -121,7 +121,7 @@ $result_trees{'ignored_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@verbatim
@@ -200,7 +200,7 @@ $result_trees{'ignored_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@verb{%
diff --git a/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl 
b/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
index ebc367ea1e..c59ae16d78 100644
--- a/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
+++ b/tp/t/results/conditionals/info_ifinfo_ifnotplaintext.pl
@@ -28,7 +28,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -55,7 +55,7 @@ $result_trees{'info_ifinfo_ifnotplaintext'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/info_ifplaintext.pl 
b/tp/t/results/conditionals/info_ifplaintext.pl
index 8852f930b0..e4760d3ce2 100644
--- a/tp/t/results/conditionals/info_ifplaintext.pl
+++ b/tp/t/results/conditionals/info_ifplaintext.pl
@@ -28,7 +28,7 @@ $result_trees{'info_ifplaintext'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'this text will only appear in plain text.
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index f858de5b06..5ce2a9eb02 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -25,7 +25,7 @@ $result_trees{'macro_in_ifset'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'truc
@@ -95,7 +95,7 @@ $result_trees{'macro_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@unmacro truc
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 1b2691af68..0a52de3d43 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -47,7 +47,7 @@ $result_trees{'macro_in_ifset_set'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'truc
@@ -117,7 +117,7 @@ $result_trees{'macro_in_ifset_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -162,7 +162,7 @@ $result_trees{'macro_in_ifset_set'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in ifset
diff --git a/tp/t/results/conditionals/many_conditionals.pl 
b/tp/t/results/conditionals/many_conditionals.pl
index ee33ec2bc6..6e6103a907 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -24,7 +24,7 @@ $result_trees{'many_conditionals'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -89,7 +89,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -171,7 +171,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnothtml text.
@@ -245,7 +245,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -327,7 +327,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is ifnotinfo text.
@@ -402,7 +402,7 @@ $result_trees{'many_conditionals'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -468,7 +468,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This is iftex text.
@@ -537,7 +537,7 @@ $result_trees{'many_conditionals'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 0f6975ea0a..a2717a8c61 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -25,7 +25,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset somevar
@@ -183,7 +183,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -221,7 +221,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -302,7 +302,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'Somevar is set, anothervar is not.
@@ -479,7 +479,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -517,7 +517,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'Both somevar and anothervar are set.
@@ -590,7 +590,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -774,7 +774,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifset anothervar
@@ -929,7 +929,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifset anothervar
diff --git 
a/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl 
b/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
index dce97378bd..05794825ad 100644
--- a/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
+++ b/tp/t/results/conditionals/nested_ifset_prepended_to_command_name.pl
@@ -33,7 +33,7 @@ $result_trees{'nested_ifset_prepended_to_command_name'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifsettoto b
diff --git a/tp/t/results/conditionals/nested_ignore.pl 
b/tp/t/results/conditionals/nested_ignore.pl
index d4ff88d77a..7da3a4db80 100644
--- a/tp/t/results/conditionals/nested_ignore.pl
+++ b/tp/t/results/conditionals/nested_ignore.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_ignore'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ignore
diff --git a/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl 
b/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
index c9c2683ee5..31dd0f71b1 100644
--- a/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
+++ b/tp/t/results/conditionals/nested_ignore_comment_no_eol.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_ignore_comment_no_eol'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ignore @c comment',
diff --git a/tp/t/results/conditionals/nested_ignore_with_comments.pl 
b/tp/t/results/conditionals/nested_ignore_with_comments.pl
index 84dd1b52dd..e20e7665a5 100644
--- a/tp/t/results/conditionals/nested_ignore_with_comments.pl
+++ b/tp/t/results/conditionals/nested_ignore_with_comments.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_ignore_with_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ignore
diff --git a/tp/t/results/conditionals/not_set.pl 
b/tp/t/results/conditionals/not_set.pl
index 1e1bb6896a..f011eb13d8 100644
--- a/tp/t/results/conditionals/not_set.pl
+++ b/tp/t/results/conditionals/not_set.pl
@@ -33,7 +33,7 @@ $result_trees{'not_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '
diff --git a/tp/t/results/conditionals/plaintext_ifinfo.pl 
b/tp/t/results/conditionals/plaintext_ifinfo.pl
index c645d1dbab..27721fee8f 100644
--- a/tp/t/results/conditionals/plaintext_ifinfo.pl
+++ b/tp/t/results/conditionals/plaintext_ifinfo.pl
@@ -28,7 +28,7 @@ $result_trees{'plaintext_ifinfo'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl 
b/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
index 38e5897665..0e16983215 100644
--- a/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
+++ b/tp/t/results/conditionals/plaintext_ifinfo_ifnotplaintext.pl
@@ -28,7 +28,7 @@ $result_trees{'plaintext_ifinfo_ifnotplaintext'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -55,7 +55,7 @@ $result_trees{'plaintext_ifinfo_ifnotplaintext'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'This will be in Info, but not plain text.
diff --git a/tp/t/results/conditionals/superfluous_argument_to_end.pl 
b/tp/t/results/conditionals/superfluous_argument_to_end.pl
index aa24fb2525..50a4e85e0c 100644
--- a/tp/t/results/conditionals/superfluous_argument_to_end.pl
+++ b/tp/t/results/conditionals/superfluous_argument_to_end.pl
@@ -28,7 +28,7 @@ $result_trees{'superfluous_argument_to_end'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
diff --git a/tp/t/results/conditionals/text_on_conditional_line.pl 
b/tp/t/results/conditionals/text_on_conditional_line.pl
index fc0e112bc2..f33ffb0435 100644
--- a/tp/t/results/conditionals/text_on_conditional_line.pl
+++ b/tp/t/results/conditionals/text_on_conditional_line.pl
@@ -33,7 +33,7 @@ $result_trees{'text_on_conditional_line'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'a
diff --git a/tp/t/results/conditionals/text_on_conditional_line_expanded.pl 
b/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
index 4fe1bf49f8..1554223abe 100644
--- a/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
+++ b/tp/t/results/conditionals/text_on_conditional_line_expanded.pl
@@ -33,7 +33,7 @@ $result_trees{'text_on_conditional_line_expanded'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index f8bb44e0eb..35a516ca09 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -20,7 +20,7 @@ $result_trees{'user_defined_txiinternalvalue'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'user internalvalue
diff --git a/tp/t/results/conditionals/value_on_ifset.pl 
b/tp/t/results/conditionals/value_on_ifset.pl
index b6f39b6108..49ed1c8319 100644
--- a/tp/t/results/conditionals/value_on_ifset.pl
+++ b/tp/t/results/conditionals/value_on_ifset.pl
@@ -75,7 +75,7 @@ $result_trees{'value_on_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -189,7 +189,7 @@ $result_trees{'value_on_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifset @value{xval}
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 41371a6bb2..ad008a3a8d 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -30,7 +30,7 @@ $result_trees{'at_commands_in_raw'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'at_commands_in_raw'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -84,7 +84,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Other macro
@@ -166,7 +166,7 @@ $result_trees{'at_commands_in_raw'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -203,7 +203,7 @@ $result_trees{'at_commands_in_raw'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -225,7 +225,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -388,7 +388,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index f01485473a..62d453d382 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -72,7 +72,7 @@ $result_trees{'combined_fonts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'combined_fonts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'combined_fonts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -182,7 +182,7 @@ $result_trees{'combined_fonts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1004,7 +1004,7 @@ $result_trees{'combined_fonts'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 0334047c6b..177eb200c6 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -30,7 +30,7 @@ $result_trees{'commands_in_sc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'commands_in_sc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'commands_in_sc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'commands_in_sc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 012cb0877c..ed20308f67 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
@@ -264,7 +264,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -300,7 +300,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -338,7 +338,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -374,7 +374,7 @@ $result_trees{'commands_in_settitle_with_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 98c0bc8605..fe0dd3e336 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -30,7 +30,7 @@ $result_trees{'commands_in_var'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'commands_in_var'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'commands_in_var'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'commands_in_var'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 965e7400ef..b6db890ec8 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -30,7 +30,7 @@ $result_trees{'complex_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'complex_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'complex_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'complex_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -162,7 +162,7 @@ $result_trees{'complex_nestings'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -859,7 +859,7 @@ $result_trees{'complex_nestings'} = {
                                               'type' => 'block_line_arg'
                                             }
                                           ],
-                                          'type' => 'argument'
+                                          'type' => 'arguments_line'
                                         },
                                         {
                                           'contents' => [
diff --git a/tp/t/results/converters_tests/contents_at_document_begin.pl 
b/tp/t/results/converters_tests/contents_at_document_begin.pl
index 0b57695919..3ab9881083 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -72,7 +72,7 @@ $result_trees{'contents_at_document_begin'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'contents_at_document_begin'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'contents_at_document_begin'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'contents_at_document_begin'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'contents_at_document_begin'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index b59ab50ca5..53b8116638 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -72,7 +72,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 3a31b3ac55..231fcbae22 100644
--- 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++ 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -72,7 +72,7 @@ $result_trees{'contents_at_document_begin_separate_element'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 4e00c02d33..84362c9c85 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -35,7 +35,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -158,7 +158,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -210,7 +210,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -346,7 +346,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -383,7 +383,7 @@ $result_trees{'conversion_with_undef_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 8ed095ea96..bfa997ca69 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -35,7 +35,7 @@ $result_trees{'definition_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'definition_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'definition_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'definition_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -10680,7 +10680,7 @@ $result_trees{'definition_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deftypefn',
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl 
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index 68beee958a..af699adb51 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -32,7 +32,7 @@ $result_trees{'email_table_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index b256b83cdf..553ca62534 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_above_ten'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/converters_tests/extension_undef.pl 
b/tp/t/results/converters_tests/extension_undef.pl
index 3ef7704bc4..8b73d3b054 100644
--- a/tp/t/results/converters_tests/extension_undef.pl
+++ b/tp/t/results/converters_tests/extension_undef.pl
@@ -44,7 +44,7 @@ $result_trees{'extension_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'extension_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'extension_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index 91f4c2f86d..f108a8b856 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -30,7 +30,7 @@ $result_trees{'footnote_no_number'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'footnote_no_number'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'footnote_no_number'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'footnote_no_number'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index eb7143ca21..c60bcfa163 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -30,7 +30,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 62efa133a8..4f4aac4cf4 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -30,7 +30,7 @@ $result_trees{'form_feeds'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -71,7 +71,7 @@ $result_trees{'form_feeds'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -440,7 +440,7 @@ $result_trees{'form_feeds'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1032,7 +1032,7 @@ $result_trees{'form_feeds'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1248,7 +1248,7 @@ $result_trees{'form_feeds'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 93fd0218a4..552bc4e503 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -74,7 +74,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -110,7 +110,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -148,7 +148,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -184,7 +184,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -250,7 +250,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1032,7 +1032,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1068,7 +1068,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1134,7 +1134,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index bbede1762b..0589d715a8 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -30,7 +30,7 @@ $result_trees{'image_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'image_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'image_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'image_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -943,7 +943,7 @@ $result_trees{'image_formatting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 274da0b522..2b9baf4f21 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -30,7 +30,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -162,7 +162,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index 717fd6f9ec..d9f60da426 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -50,7 +50,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -194,7 +194,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -347,7 +347,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -557,7 +557,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -705,7 +705,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -812,7 +812,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -951,7 +951,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1085,7 +1085,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1219,7 +1219,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1357,7 +1357,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1579,7 +1579,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1724,7 +1724,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1909,7 +1909,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2266,7 +2266,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2441,7 +2441,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2606,7 +2606,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2781,7 +2781,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2946,7 +2946,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3112,7 +3112,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3273,7 +3273,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3434,7 +3434,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3679,7 +3679,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3717,7 +3717,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 2bca00fe5f..1022902e0c 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -50,7 +50,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -194,7 +194,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -348,7 +348,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'type' => 'before_item'
@@ -557,7 +557,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -706,7 +706,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -813,7 +813,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -952,7 +952,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1087,7 +1087,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1221,7 +1221,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1360,7 +1360,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'type' => 'before_item'
@@ -1581,7 +1581,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1726,7 +1726,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1911,7 +1911,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2268,7 +2268,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2443,7 +2443,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2608,7 +2608,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2783,7 +2783,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2948,7 +2948,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3114,7 +3114,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3275,7 +3275,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3436,7 +3436,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3681,7 +3681,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3719,7 +3719,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index a991003185..c39d57ae3a 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -24,7 +24,7 @@ $result_trees{'line_breaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -213,7 +213,7 @@ $result_trees{'line_breaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -379,7 +379,7 @@ $result_trees{'line_breaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/link.pl 
b/tp/t/results/converters_tests/link.pl
index 45c322d2db..4db1cdaa57 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -30,7 +30,7 @@ $result_trees{'link'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'link'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -120,7 +120,7 @@ $result_trees{'link'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/multitable_prototypes.pl 
b/tp/t/results/converters_tests/multitable_prototypes.pl
index f599954895..5c1b1cf346 100644
--- a/tp/t/results/converters_tests/multitable_prototypes.pl
+++ b/tp/t/results/converters_tests/multitable_prototypes.pl
@@ -111,7 +111,7 @@ $result_trees{'multitable_prototypes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 5c3cb8e820..42b62c4ac3 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -30,7 +30,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -140,7 +140,7 @@ $result_trees{'non_empty_part'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -307,7 +307,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -359,7 +359,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -400,7 +400,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -452,7 +452,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -488,7 +488,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -540,7 +540,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -581,7 +581,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -633,7 +633,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -685,7 +685,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -726,7 +726,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -778,7 +778,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -819,7 +819,7 @@ $result_trees{'non_empty_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index c5cee4647f..459eb7e69f 100644
--- a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -30,7 +30,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -140,7 +140,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -307,7 +307,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -359,7 +359,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -400,7 +400,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -452,7 +452,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -488,7 +488,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -540,7 +540,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -581,7 +581,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -633,7 +633,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -685,7 +685,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -726,7 +726,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -778,7 +778,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -819,7 +819,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 66d1128e9c..85c1032b28 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -24,7 +24,7 @@ $result_trees{'normal_font_in_monospace'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index f4261ac14b..4f3efc2c2e 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -35,7 +35,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -146,7 +146,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index f8d2b22344..2a9da5f32a 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -29,7 +29,7 @@ $result_trees{'raw_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -95,7 +95,7 @@ $result_trees{'raw_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -161,7 +161,7 @@ $result_trees{'raw_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -227,7 +227,7 @@ $result_trees{'raw_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -323,7 +323,7 @@ $result_trees{'raw_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 b555591995..2cb17cc087 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
@@ -29,7 +29,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -95,7 +95,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -161,7 +161,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -227,7 +227,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -323,7 +323,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 7d4a5833f8..4f2749b39f 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -51,7 +51,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -199,7 +199,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -221,7 +221,7 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -386,7 +386,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -482,7 +482,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -522,7 +522,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -582,7 +582,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -734,7 +734,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -811,7 +811,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -917,7 +917,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1012,7 +1012,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1100,7 +1100,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1188,7 +1188,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1264,7 +1264,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1334,7 +1334,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1423,7 +1423,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1519,7 +1519,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1595,7 +1595,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1672,7 +1672,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1737,7 +1737,7 @@ $result_trees{'ref_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 aee8309777..8459ddade2 100644
--- a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -35,7 +35,7 @@ $result_trees{'reference_for_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -72,7 +72,7 @@ $result_trees{'reference_for_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'reference_for_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -148,7 +148,7 @@ $result_trees{'reference_for_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index b44fab1c48..e332c1221e 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
@@ -76,7 +76,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -217,7 +217,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -411,7 +411,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -633,7 +633,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -670,7 +670,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -964,7 +964,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index d444ff660d..169a177986 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -30,7 +30,7 @@ $result_trees{'refs_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'refs_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/sections_and_printindex.pl 
b/tp/t/results/converters_tests/sections_and_printindex.pl
index 88645c18f7..ab0817dfef 100644
--- a/tp/t/results/converters_tests/sections_and_printindex.pl
+++ b/tp/t/results/converters_tests/sections_and_printindex.pl
@@ -30,7 +30,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -216,7 +216,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -253,7 +253,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -329,7 +329,7 @@ $result_trees{'sections_and_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/setfilename_no_extension.pl 
b/tp/t/results/converters_tests/setfilename_no_extension.pl
index 2b54f53ca6..901cdb60fa 100644
--- a/tp/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -72,7 +72,7 @@ $result_trees{'setfilename_no_extension'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'setfilename_no_extension'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'setfilename_no_extension'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/simplest_test_prefix.pl 
b/tp/t/results/converters_tests/simplest_test_prefix.pl
index a53c1afd5d..05c9b0e551 100644
--- a/tp/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tp/t/results/converters_tests/simplest_test_prefix.pl
@@ -50,7 +50,7 @@ $result_trees{'simplest_test_prefix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 425e763885..7645e8eeb8 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
@@ -37,7 +37,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -95,7 +95,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -633,7 +633,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -828,7 +828,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index 572efe9cd2..87cb3b2947 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'sp_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 3fa4fbf8f5..a02154d8ab 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
@@ -30,7 +30,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -290,7 +290,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -344,7 +344,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -394,7 +394,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 2883682972..0f82aff9cd 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -30,7 +30,7 @@ $result_trees{'spaces_in_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -305,7 +305,7 @@ $result_trees{'spaces_in_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -366,7 +366,7 @@ $result_trees{'spaces_in_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -423,7 +423,7 @@ $result_trees{'spaces_in_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl 
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index 480fad3544..d5e83d756d 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'table_in_display_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'display',
@@ -41,7 +41,7 @@ $result_trees{'table_in_display_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'table',
@@ -66,7 +66,7 @@ $result_trees{'table_in_display_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl 
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index 3eca92866f..34ddfaeaef 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -24,7 +24,7 @@ $result_trees{'table_in_example_in_display'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -41,7 +41,7 @@ $result_trees{'table_in_example_in_display'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'table',
@@ -66,7 +66,7 @@ $result_trees{'table_in_example_in_display'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 57d519fbcf..04ec8c0f15 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -104,7 +104,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -214,7 +214,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/test_formatting_customizations.pl 
b/tp/t/results/converters_tests/test_formatting_customizations.pl
index 51a148089a..defe5b873c 100644
--- a/tp/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/test_formatting_customizations.pl
@@ -35,7 +35,7 @@ $result_trees{'test_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -72,7 +72,7 @@ $result_trees{'test_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'test_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -148,7 +148,7 @@ $result_trees{'test_formatting_customizations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 835306f148..a05c1349e5 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -281,7 +281,7 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -418,7 +418,7 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -552,7 +552,7 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -825,7 +825,7 @@ $result_trees{'things_before_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -862,7 +862,7 @@ $result_trees{'things_before_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -901,7 +901,7 @@ $result_trees{'things_before_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -938,7 +938,7 @@ $result_trees{'things_before_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 f6de4fe076..a4c40dad69 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
@@ -281,7 +281,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -418,7 +418,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -552,7 +552,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 31702ec6aa..f6e969ee76 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'top_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -71,7 +71,7 @@ $result_trees{'top_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 cb6a888841..4dcf8d6549 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
@@ -30,7 +30,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -267,7 +267,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -388,7 +388,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -532,7 +532,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -629,7 +629,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -788,7 +788,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -909,7 +909,7 @@ $result_trees{'various_itemize_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 0e4771beca..cd4cdf371c 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
@@ -30,7 +30,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -375,7 +375,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -526,7 +526,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -677,7 +677,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -828,7 +828,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1005,7 +1005,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1156,7 +1156,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1317,7 +1317,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1354,7 +1354,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index bfe626daac..018c924261 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -29,7 +29,7 @@ $result_trees{'block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -187,7 +187,7 @@ $result_trees{'block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/bye_on_end_command_line.pl 
b/tp/t/results/coverage/bye_on_end_command_line.pl
index cd0ab62ee2..15022c6b0d 100644
--- a/tp/t/results/coverage/bye_on_end_command_line.pl
+++ b/tp/t/results/coverage/bye_on_end_command_line.pl
@@ -24,7 +24,7 @@ $result_trees{'bye_on_end_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 03b4bac647..63b3aacd2e 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -24,7 +24,7 @@ $result_trees{'cartouche'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -108,7 +108,7 @@ $result_trees{'cartouche'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index f2d6b39392..90433b7049 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'cartouche_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'cartouche_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 1d6cc29fe7..f9802e15bc 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -24,7 +24,7 @@ $result_trees{'cartouche_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'cartouche_in_quotation'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/cartouche_title_and_content.pl 
b/tp/t/results/coverage/cartouche_title_and_content.pl
index 0be52e94f7..928e1da509 100644
--- a/tp/t/results/coverage/cartouche_title_and_content.pl
+++ b/tp/t/results/coverage/cartouche_title_and_content.pl
@@ -45,7 +45,7 @@ $result_trees{'cartouche_title_and_content'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/command_in_end.pl 
b/tp/t/results/coverage/command_in_end.pl
index ee7ad341d5..97962e6ee6 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -24,7 +24,7 @@ $result_trees{'command_in_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -95,7 +95,7 @@ $result_trees{'command_in_end'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'command_in_end'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -249,7 +249,7 @@ $result_trees{'command_in_end'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -329,7 +329,7 @@ $result_trees{'command_in_end'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -409,7 +409,7 @@ $result_trees{'command_in_end'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -489,7 +489,7 @@ $result_trees{'command_in_end'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -569,7 +569,7 @@ $result_trees{'command_in_end'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'text' => 'In verbatim
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 ae36eb5c35..388c0ba9c3 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
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 1070dba0de..60628c99d2 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
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 82649dd3e2..86bfd20ed5 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
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 34135f3c5a..68b7d92005 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
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 7a0d941a1c..c2e7c0da5e 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
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 083dc9afa1..37407254c8 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
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 8a93020016..dec4540173 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
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 af8aa156e4..a5922e291b 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
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
index f79ff9e994..16e82c2dd1 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
index 34a3015104..4340373e03 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
index 9d639789d5..f4609e4b6e 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
index ab83887088..eb71d11894 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
index 856fdf4a23..d39caa01b0 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -24,7 +24,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index d645e45a15..6d50411d15 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -29,7 +29,7 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'strong',
@@ -177,7 +177,7 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => '"',
@@ -857,7 +857,7 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'click',
@@ -1447,7 +1447,7 @@ $result_trees{'commands_in_math'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotedblleft',
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 2dab370214..e3a33803db 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -30,7 +30,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -128,7 +128,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index eeb94077ed..46f1845a46 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -30,7 +30,7 @@ $result_trees{'comment_on_group_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index ee5fc66663..44b32fcc1a 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -33,7 +33,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '--'
@@ -137,7 +137,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'code',
@@ -261,7 +261,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => ' \\underline'
@@ -420,7 +420,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'c',
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 3701911125..17938db476 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
@@ -24,7 +24,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index 5747502c12..fd80bbf4b7 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -24,7 +24,7 @@ $result_trees{'exdent_and_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'exdent_and_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index 4053946c5f..148c68bf8f 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -24,7 +24,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -162,7 +162,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
@@ -305,7 +305,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -417,7 +417,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -487,7 +487,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -567,7 +567,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -593,7 +593,7 @@ $result_trees{'exdent_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -721,7 +721,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
@@ -805,7 +805,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -898,7 +898,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
@@ -991,7 +991,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
@@ -1102,7 +1102,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
@@ -1213,7 +1213,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1306,7 +1306,7 @@ $result_trees{'exdent_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index 3e11ab4b12..867bba011e 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -29,7 +29,7 @@ $result_trees{'flushleft_flushright'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -117,7 +117,7 @@ $result_trees{'flushleft_flushright'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index d23c203367..673724e629 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -29,7 +29,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'flushleft',
@@ -46,7 +46,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '   ',
@@ -116,7 +116,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '  ',
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index af22c610a6..6a228ec178 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -24,7 +24,7 @@ $result_trees{'flushright_example_nested'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'flushright',
@@ -41,7 +41,7 @@ $result_trees{'flushright_example_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -147,7 +147,7 @@ $result_trees{'flushright_example_nested'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -164,7 +164,7 @@ $result_trees{'flushright_example_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/flushright_not_closed.pl 
b/tp/t/results/coverage/flushright_not_closed.pl
index 327781eb6d..92db229f00 100644
--- a/tp/t/results/coverage/flushright_not_closed.pl
+++ b/tp/t/results/coverage/flushright_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'flushright_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index 786cd6ceee..2e4ece1293 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -32,7 +32,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -122,7 +122,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -219,7 +219,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -325,7 +325,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -433,7 +433,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index 5218c05b62..a2596305f1 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -32,7 +32,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -106,7 +106,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -188,7 +188,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -275,7 +275,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -383,7 +383,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 067d7685f4..ca77540493 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -32,7 +32,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -236,7 +236,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -360,7 +360,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -511,7 +511,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/group_beginning_and_end_on_line.pl 
b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
index 785efac84b..7d20534d8f 100644
--- a/tp/t/results/coverage/group_beginning_and_end_on_line.pl
+++ b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
@@ -28,7 +28,7 @@ $result_trees{'group_beginning_and_end_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/coverage/group_not_closed.pl 
b/tp/t/results/coverage/group_not_closed.pl
index 56d1e6dd7d..160e008630 100644
--- a/tp/t/results/coverage/group_not_closed.pl
+++ b/tp/t/results/coverage/group_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'group_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index fe94c65d49..8dd5a2d480 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -24,7 +24,7 @@ $result_trees{'indentedblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  ',
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 343309e5aa..24904f2cd1 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -24,7 +24,7 @@ $result_trees{'insertcopying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -55,7 +55,7 @@ $result_trees{'insertcopying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index 57a2bb4822..d2d000df31 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -34,7 +34,7 @@ $result_trees{'item_container'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -128,7 +128,7 @@ $result_trees{'item_container'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -230,7 +230,7 @@ $result_trees{'item_container'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 8c57501cae..f65acfdada 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -58,7 +58,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -403,7 +403,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 4cff902c39..a3e77b6362 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -151,7 +151,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -168,7 +168,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -269,7 +269,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -295,7 +295,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -405,7 +405,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -436,7 +436,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -537,7 +537,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -573,7 +573,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -674,7 +674,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -705,7 +705,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -806,7 +806,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -823,7 +823,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -929,7 +929,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -946,7 +946,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -1057,7 +1057,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -1074,7 +1074,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1180,7 +1180,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -1197,7 +1197,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1312,7 +1312,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -1329,7 +1329,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1444,7 +1444,7 @@ $result_trees{'nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -1461,7 +1461,7 @@ $result_trees{'nested_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index b87f8790d6..6d7909367d 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -29,7 +29,7 @@ $result_trees{'preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -104,7 +104,7 @@ $result_trees{'preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'vtable',
@@ -129,7 +129,7 @@ $result_trees{'preformatted'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 5a0a674bd1..cc8045046f 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -37,7 +37,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -74,7 +74,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -211,7 +211,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -325,7 +325,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -448,7 +448,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index bcb53e1261..4f7abe2ab0 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -24,7 +24,7 @@ $result_trees{'quotation_author'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index e8bb1f8668..4da5a9bdfa 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -29,7 +29,7 @@ $result_trees{'raggedright'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index 64387728be..e3c36dad4b 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -24,7 +24,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -176,7 +176,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In verbatim
@@ -238,7 +238,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In verbatim
@@ -325,7 +325,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -449,7 +449,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -590,7 +590,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -687,7 +687,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -822,7 +822,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1037,7 +1037,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1240,7 +1240,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1306,7 +1306,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1389,7 +1389,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1455,7 +1455,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index ea57a55ecb..484bfd15d4 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -32,7 +32,7 @@ $result_trees{'symbol_after_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 36e3902887..1ee8ee57ba 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -37,7 +37,7 @@ $result_trees{'table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -472,7 +472,7 @@ $result_trees{'table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 53555cf70c..d21df6d87d 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -38,7 +38,7 @@ $result_trees{'table_command_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index b5503a0a79..8bf08bf4ef 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -29,7 +29,7 @@ $result_trees{'caption_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
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 30be0ba520..0dafaffe7b 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -30,7 +30,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -141,7 +141,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl 
b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
index 6ea57a4b96..aec4393b4b 100644
--- a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
+++ b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
@@ -256,7 +256,7 @@ $result_trees{'definfoenclose_texinfo_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index e3ec1145b1..abcb262fad 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -30,7 +30,7 @@ $result_trees{'footnote_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           '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 544cb2bc30..bceb36ae2e 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
@@ -34,7 +34,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -126,7 +126,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
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 130b24e310..93a0c2a4d4 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -30,7 +30,7 @@ $result_trees{'inforef_too_much_args'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index 24767f4bcc..32500054a7 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -175,7 +175,7 @@ $result_trees{'kbd'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -281,7 +281,7 @@ $result_trees{'kbd'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage_braces/seeentry_no_braces.pl 
b/tp/t/results/coverage_braces/seeentry_no_braces.pl
index 7b8f347e50..a941e62f67 100644
--- a/tp/t/results/coverage_braces/seeentry_no_braces.pl
+++ b/tp/t/results/coverage_braces/seeentry_no_braces.pl
@@ -30,7 +30,7 @@ $result_trees{'seeentry_no_braces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'seeentry_no_braces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'seeentry_no_braces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -141,7 +141,7 @@ $result_trees{'seeentry_no_braces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index f03cf5e08f..4afe0a2f06 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -20,7 +20,7 @@ $result_trees{'test_image'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :} 
,,,,.ext@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :}}
@@ -96,7 +96,7 @@ $result_trees{'test_image'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -612,7 +612,7 @@ $result_trees{'test_image'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -648,7 +648,7 @@ $result_trees{'test_image'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1145,7 +1145,7 @@ $result_trees{'test_image'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1680,7 +1680,7 @@ $result_trees{'test_image'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'image',
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 e53281180b..0dc6bfa009 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -199,7 +199,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -318,7 +318,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -354,7 +354,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 44561e998f..5875b4516a 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
@@ -69,7 +69,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -352,7 +352,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -388,7 +388,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 39b0767175..89e8fb8366 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
@@ -69,7 +69,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -352,7 +352,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -388,7 +388,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/adjacent_defline.pl 
b/tp/t/results/def/adjacent_defline.pl
index db41b4a218..f76644ea49 100644
--- a/tp/t/results/def/adjacent_defline.pl
+++ b/tp/t/results/def/adjacent_defline.pl
@@ -27,7 +27,7 @@ $result_trees{'adjacent_defline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index eb24f5c9de..d1499adc31 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -30,7 +30,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 5bfd4d5276..e2d9438e06 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -30,7 +30,7 @@ $result_trees{'all_commands_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'all_commands_printindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/comment_index_before_defline.pl 
b/tp/t/results/def/comment_index_before_defline.pl
index 357e28c910..26aabd4643 100644
--- a/tp/t/results/def/comment_index_before_defline.pl
+++ b/tp/t/results/def/comment_index_before_defline.pl
@@ -27,7 +27,7 @@ $result_trees{'comment_index_before_defline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/def/defblock_no_defline.pl 
b/tp/t/results/def/defblock_no_defline.pl
index e5893474d6..310bbb8443 100644
--- a/tp/t/results/def/defblock_no_defline.pl
+++ b/tp/t/results/def/defblock_no_defline.pl
@@ -27,7 +27,7 @@ $result_trees{'defblock_no_defline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/def/defline_no_params.pl 
b/tp/t/results/def/defline_no_params.pl
index c18643fcc0..57035e07b7 100644
--- a/tp/t/results/def/defline_no_params.pl
+++ b/tp/t/results/def/defline_no_params.pl
@@ -27,7 +27,7 @@ $result_trees{'defline_no_params'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index cf40f747c2..1a9c8d3d61 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -27,7 +27,7 @@ $result_trees{'deftypeline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deftypeline',
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 ab9d93cefc..053fd74a5d 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deffn',
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 ab5db30826..b832d38da3 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
@@ -24,7 +24,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deffn',
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 65d862574f..7d560c21f6 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -24,7 +24,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deffn',
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 21e69bfc11..57ab5bb87a 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'defx_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deffn',
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 a6c25a2f19..deb16c9264 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
@@ -24,7 +24,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deffn',
diff --git a/tp/t/results/def/multiple_defline.pl 
b/tp/t/results/def/multiple_defline.pl
index 9d516ddeed..d26a3bd990 100644
--- a/tp/t/results/def/multiple_defline.pl
+++ b/tp/t/results/def/multiple_defline.pl
@@ -27,7 +27,7 @@ $result_trees{'multiple_defline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 6ac0bfe620..a51028a01f 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -30,7 +30,7 @@ $result_trees{'omit_def_space'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -71,7 +71,7 @@ $result_trees{'omit_def_space'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index a2d5257f68..b1fdf0f9c5 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -37,7 +37,7 @@ $result_trees{'ref_in_def'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 941246339e..e49a70c6fb 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -30,7 +30,7 @@ $result_trees{'space_in_def_for_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'space_in_def_for_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/def/text_block_before_defline.pl 
b/tp/t/results/def/text_block_before_defline.pl
index c24fceae38..c1e9dc4ef1 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -35,7 +35,7 @@ $result_trees{'text_block_before_defline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'text_block_before_defline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'text_block_before_defline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'text_block_before_defline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -167,7 +167,7 @@ $result_trees{'text_block_before_defline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -225,7 +225,7 @@ $result_trees{'text_block_before_defline'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'text_block_before_defline'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
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 bd2e9e58d4..a0563a59e0 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -37,7 +37,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -149,7 +149,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -189,7 +189,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'anchor',
@@ -250,7 +250,7 @@ $result_trees{'between_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
index 0c020b82c7..2e1d37b9fb 100644
--- 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
+++ 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
@@ -29,7 +29,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -91,7 +91,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index 326f989558..bdac059fe4 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -67,7 +67,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -103,7 +103,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -141,7 +141,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -177,7 +177,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -247,7 +247,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -353,7 +353,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -389,7 +389,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -459,7 +459,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -495,7 +495,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index c94408a904..e7a7cb17e5 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -30,7 +30,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -102,7 +102,7 @@ $result_trees{'special_docbook_unnumbered'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -359,7 +359,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -395,7 +395,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -447,7 +447,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -483,7 +483,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -535,7 +535,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -571,7 +571,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -623,7 +623,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -659,7 +659,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/epub_tests/chapter_before_top_epub.pl 
b/tp/t/results/epub_tests/chapter_before_top_epub.pl
index aac4e9816e..7e469c406e 100644
--- a/tp/t/results/epub_tests/chapter_before_top_epub.pl
+++ b/tp/t/results/epub_tests/chapter_before_top_epub.pl
@@ -35,7 +35,7 @@ $result_trees{'chapter_before_top_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'chapter_before_top_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -112,7 +112,7 @@ $result_trees{'chapter_before_top_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -152,7 +152,7 @@ $result_trees{'chapter_before_top_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -190,7 +190,7 @@ $result_trees{'chapter_before_top_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/epub_tests/section_part_epub.pl 
b/tp/t/results/epub_tests/section_part_epub.pl
index 28d02eb95d..c2e370c437 100644
--- a/tp/t/results/epub_tests/section_part_epub.pl
+++ b/tp/t/results/epub_tests/section_part_epub.pl
@@ -35,7 +35,7 @@ $result_trees{'section_part_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'section_part_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'section_part_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl 
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
index f64ed3ad9e..9e38570500 100644
--- a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
+++ b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
@@ -35,7 +35,7 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -95,7 +95,7 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index 20753fd40c..0ecf585319 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -35,7 +35,7 @@ $result_trees{'anchor_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'anchor_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -144,7 +144,7 @@ $result_trees{'anchor_in_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index be616be64e..6ce43061b0 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -35,7 +35,7 @@ $result_trees{'cindex_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'cindex_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -144,7 +144,7 @@ $result_trees{'cindex_in_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 85f0ec8f84..5859e40c98 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -35,7 +35,7 @@ $result_trees{'comment_space_comand_in_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'comment_space_comand_in_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -121,7 +121,7 @@ $result_trees{'comment_space_comand_in_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index b263485154..83cc083821 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -35,7 +35,7 @@ $result_trees{'complex_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'complex_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'complex_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'complex_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -327,7 +327,7 @@ $result_trees{'complex_float'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'An example.
@@ -510,7 +510,7 @@ $result_trees{'complex_float'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -643,7 +643,7 @@ $result_trees{'complex_float'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -1043,7 +1043,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -1156,7 +1156,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -1308,7 +1308,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -1550,7 +1550,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
@@ -2223,7 +2223,7 @@ $result_trees{'complex_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2259,7 +2259,7 @@ $result_trees{'complex_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2297,7 +2297,7 @@ $result_trees{'complex_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -2365,7 +2365,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -2448,7 +2448,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -2600,7 +2600,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -2842,7 +2842,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 22d221bab5..2d355a5361 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -43,7 +43,7 @@ $result_trees{'empty_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -150,7 +150,7 @@ $result_trees{'empty_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'empty_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/empty_label_no_space.pl 
b/tp/t/results/float/empty_label_no_space.pl
index 41410cc7ba..bbb1853dcb 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_label_no_space'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/float/empty_label_no_space_comment.pl 
b/tp/t/results/float/empty_label_no_space_comment.pl
index e729f534d4..fff041fe05 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -41,7 +41,7 @@ $result_trees{'empty_label_no_space_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/float/empty_label_with_space.pl 
b/tp/t/results/float/empty_label_with_space.pl
index 63ec4b9502..7dc4ab4edd 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_label_with_space'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/float/empty_label_with_space_comment.pl 
b/tp/t/results/float/empty_label_with_space_comment.pl
index 43621111d3..60c5456956 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -44,7 +44,7 @@ $result_trees{'empty_label_with_space_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index e44fa5ee7c..eef11a40fa 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -48,7 +48,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -241,7 +241,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -310,7 +310,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index da0862d873..d332d5b19d 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'float_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -64,7 +64,7 @@ $result_trees{'float_copying'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'text' => '
@@ -519,7 +519,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -555,7 +555,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -596,7 +596,7 @@ $result_trees{'float_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -715,7 +715,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -752,7 +752,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/float/float_in_block_commands.pl 
b/tp/t/results/float/float_in_block_commands.pl
index 73165dc648..34b5e93396 100644
--- a/tp/t/results/float/float_in_block_commands.pl
+++ b/tp/t/results/float/float_in_block_commands.pl
@@ -27,7 +27,7 @@ $result_trees{'float_in_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'float',
@@ -60,7 +60,7 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'caption',
@@ -200,7 +200,7 @@ $result_trees{'float_in_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'float',
@@ -233,7 +233,7 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'caption',
@@ -365,7 +365,7 @@ $result_trees{'float_in_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'float',
@@ -398,7 +398,7 @@ $result_trees{'float_in_block_commands'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'caption',
diff --git a/tp/t/results/float/float_type_with_tieaccent.pl 
b/tp/t/results/float/float_type_with_tieaccent.pl
index d63d37883a..1c24c13542 100644
--- a/tp/t/results/float/float_type_with_tieaccent.pl
+++ b/tp/t/results/float/float_type_with_tieaccent.pl
@@ -113,7 +113,7 @@ $result_trees{'float_type_with_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index ddfb4eca54..ee93ebb276 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -100,7 +100,7 @@ $result_trees{'float_with_at_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index ea6a3317fd..c30a4e61e7 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -35,7 +35,7 @@ $result_trees{'footnote_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'footnote_in_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -144,7 +144,7 @@ $result_trees{'footnote_in_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 cdb5883789..82f9d9b152 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -35,7 +35,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -144,7 +144,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/multiple_spaces_in_float_type.pl 
b/tp/t/results/float/multiple_spaces_in_float_type.pl
index ec34dfc7ac..10dd92da82 100644
--- a/tp/t/results/float/multiple_spaces_in_float_type.pl
+++ b/tp/t/results/float/multiple_spaces_in_float_type.pl
@@ -43,7 +43,7 @@ $result_trees{'multiple_spaces_in_float_type'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 463ed4c9b9..fadfe11d10 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -35,7 +35,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -274,7 +274,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -422,7 +422,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -577,7 +577,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -664,7 +664,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -739,7 +739,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -877,7 +877,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1035,7 +1035,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1177,7 +1177,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1480,7 +1480,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1516,7 +1516,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1554,7 +1554,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1682,7 +1682,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'caption',
@@ -1850,7 +1850,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2046,7 +2046,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2204,7 +2204,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2346,7 +2346,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2467,7 +2467,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2503,7 +2503,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2541,7 +2541,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -2646,7 +2646,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2682,7 +2682,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2704,7 +2704,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2818,7 +2818,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2958,7 +2958,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3121,7 +3121,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3157,7 +3157,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3200,7 +3200,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3353,7 +3353,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3389,7 +3389,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3411,7 +3411,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3525,7 +3525,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3680,7 +3680,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3716,7 +3716,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3754,7 +3754,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3899,7 +3899,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4057,7 +4057,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4093,7 +4093,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4131,7 +4131,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -4291,7 +4291,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4327,7 +4327,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 412d6fc86b..44d13ec3f8 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -43,7 +43,7 @@ $result_trees{'ref_to_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'ref_to_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 0672020f3d..346d5b171e 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -43,7 +43,7 @@ $result_trees{'simple'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
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 d4535b0555..a6f67efe74 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -35,7 +35,7 @@ $result_trees{'special_characters_in_float_type'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'special_characters_in_float_type'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'special_characters_in_float_type'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'special_characters_in_float_type'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -227,7 +227,7 @@ $result_trees{'special_characters_in_float_type'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index c1404e7700..273dcc536c 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -35,7 +35,7 @@ $result_trees{'accent'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'accent'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl 
b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
index 2eb9aae9b3..c25de3e451 100644
--- a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -35,7 +35,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'accent_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index f155f6ccef..3fdc27aef1 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -35,7 +35,7 @@ $result_trees{'accent_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'accent_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index b54990f0f7..6150a189b5 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -73,7 +73,7 @@ $result_trees{'accentenc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'accentenc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 88e7e1ab0e..3c8eec4200 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -68,7 +68,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -104,7 +104,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 997a9494be..e3dbc94e97 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -35,7 +35,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3663,7 +3663,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3711,7 +3711,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3799,7 +3799,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3883,7 +3883,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3987,7 +3987,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4087,7 +4087,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4219,7 +4219,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4347,7 +4347,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4465,7 +4465,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4579,7 +4579,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4655,7 +4655,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4727,7 +4727,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4859,7 +4859,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4987,7 +4987,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5091,7 +5091,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5191,7 +5191,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5421,7 +5421,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5647,7 +5647,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5903,7 +5903,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6155,7 +6155,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6322,7 +6322,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6485,7 +6485,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6602,7 +6602,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6715,7 +6715,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6833,7 +6833,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6947,7 +6947,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7065,7 +7065,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7179,7 +7179,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7219,7 +7219,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7255,7 +7255,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7359,7 +7359,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7459,7 +7459,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7581,7 +7581,7 @@ $result_trees{'at_commands_in_refs'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -7592,7 +7592,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7729,7 +7729,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7826,7 +7826,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7919,7 +7919,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8047,7 +8047,7 @@ $result_trees{'at_commands_in_refs'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8058,7 +8058,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8201,7 +8201,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8276,7 +8276,7 @@ $result_trees{'at_commands_in_refs'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8287,7 +8287,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8377,7 +8377,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8620,7 +8620,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8859,7 +8859,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9042,7 +9042,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9221,7 +9221,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9277,7 +9277,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9329,7 +9329,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9401,7 +9401,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9469,7 +9469,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9522,7 +9522,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9571,7 +9571,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9643,7 +9643,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9711,7 +9711,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9826,7 +9826,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9937,7 +9937,7 @@ $result_trees{'at_commands_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -12042,7 +12042,7 @@ $result_trees{'at_commands_in_refs'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -12313,7 +12313,7 @@ $result_trees{'at_commands_in_refs'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
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 a4625d00c6..7c5aee5ba4 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
@@ -103,7 +103,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -139,7 +139,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -161,7 +161,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3731,7 +3731,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3779,7 +3779,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3867,7 +3867,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3951,7 +3951,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4055,7 +4055,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4155,7 +4155,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4287,7 +4287,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4415,7 +4415,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4533,7 +4533,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4647,7 +4647,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4723,7 +4723,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4795,7 +4795,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4927,7 +4927,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5055,7 +5055,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5159,7 +5159,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5259,7 +5259,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5489,7 +5489,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5715,7 +5715,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5971,7 +5971,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6223,7 +6223,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6390,7 +6390,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6553,7 +6553,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6670,7 +6670,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6783,7 +6783,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6901,7 +6901,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7015,7 +7015,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7133,7 +7133,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7247,7 +7247,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7287,7 +7287,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7323,7 +7323,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7427,7 +7427,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7527,7 +7527,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7649,7 +7649,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -7660,7 +7660,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7797,7 +7797,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7894,7 +7894,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7987,7 +7987,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8115,7 +8115,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8126,7 +8126,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8269,7 +8269,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8344,7 +8344,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8355,7 +8355,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8445,7 +8445,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8688,7 +8688,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8927,7 +8927,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9110,7 +9110,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9289,7 +9289,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9345,7 +9345,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9397,7 +9397,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9469,7 +9469,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9537,7 +9537,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9590,7 +9590,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9639,7 +9639,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9711,7 +9711,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9779,7 +9779,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9894,7 +9894,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -10005,7 +10005,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -12110,7 +12110,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -12381,7 +12381,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
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 e142557848..c8277b8a67 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
@@ -103,7 +103,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -139,7 +139,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -161,7 +161,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3731,7 +3731,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3779,7 +3779,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3867,7 +3867,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3951,7 +3951,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4055,7 +4055,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4155,7 +4155,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4287,7 +4287,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4415,7 +4415,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4533,7 +4533,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4647,7 +4647,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4723,7 +4723,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4795,7 +4795,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4927,7 +4927,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5055,7 +5055,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5159,7 +5159,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5259,7 +5259,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5489,7 +5489,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -5715,7 +5715,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -5971,7 +5971,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6223,7 +6223,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6390,7 +6390,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6553,7 +6553,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6670,7 +6670,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6783,7 +6783,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -6901,7 +6901,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7015,7 +7015,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7133,7 +7133,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7247,7 +7247,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7287,7 +7287,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7323,7 +7323,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7427,7 +7427,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7527,7 +7527,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7649,7 +7649,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -7660,7 +7660,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7797,7 +7797,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -7894,7 +7894,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -7987,7 +7987,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8115,7 +8115,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8126,7 +8126,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8269,7 +8269,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8344,7 +8344,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -8355,7 +8355,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8445,7 +8445,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -8688,7 +8688,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -8927,7 +8927,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9110,7 +9110,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9289,7 +9289,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9345,7 +9345,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9397,7 +9397,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9469,7 +9469,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9537,7 +9537,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9590,7 +9590,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9639,7 +9639,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9711,7 +9711,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -9779,7 +9779,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -9894,7 +9894,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -10005,7 +10005,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -12110,7 +12110,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -12381,7 +12381,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
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 7aedf257a4..b0d9dd47a8 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
@@ -89,7 +89,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -127,7 +127,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -187,7 +187,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -498,7 +498,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -535,7 +535,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -576,7 +576,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -613,7 +613,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -654,7 +654,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -691,7 +691,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -732,7 +732,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -769,7 +769,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -810,7 +810,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -847,7 +847,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 547f22fa1a..aca6986e9f 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
@@ -89,7 +89,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -127,7 +127,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -236,7 +236,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -359,7 +359,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -396,7 +396,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 daaf47eedf..2138a6e2ae 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
@@ -89,7 +89,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -127,7 +127,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -187,7 +187,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -498,7 +498,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -535,7 +535,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -576,7 +576,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -613,7 +613,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -654,7 +654,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -691,7 +691,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -732,7 +732,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -769,7 +769,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -810,7 +810,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -847,7 +847,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 6e487e8ba7..441b3b58bf 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
@@ -89,7 +89,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -127,7 +127,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -187,7 +187,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -498,7 +498,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -535,7 +535,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -576,7 +576,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -613,7 +613,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -654,7 +654,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -691,7 +691,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -732,7 +732,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -769,7 +769,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -810,7 +810,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -847,7 +847,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 806c4391eb..bb2ad628c5 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -112,7 +112,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 466f8b0d56..4464380475 100644
--- a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
@@ -35,7 +35,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'dotless_argument_non_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 8fe2088a74..916599849d 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -184,7 +184,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -243,7 +243,7 @@ $result_trees{'japanese_shift_jis'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -419,7 +419,7 @@ $result_trees{'japanese_shift_jis'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -589,7 +589,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -626,7 +626,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -686,7 +686,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -723,7 +723,7 @@ $result_trees{'japanese_shift_jis'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3d68ce0b35..043de4e392 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
@@ -89,7 +89,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -207,7 +207,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -244,7 +244,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           '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 648c2df73b..13436f5725 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -50,7 +50,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -168,7 +168,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -205,7 +205,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/multiple_include_encodings.pl 
b/tp/t/results/formats_encodings/multiple_include_encodings.pl
index 5523cdaf19..9eb5d6825f 100644
--- a/tp/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tp/t/results/formats_encodings/multiple_include_encodings.pl
@@ -73,7 +73,7 @@ $result_trees{'multiple_include_encodings'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -217,7 +217,7 @@ $result_trees{'multiple_include_encodings'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -340,7 +340,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -377,7 +377,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -477,7 +477,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -514,7 +514,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -667,7 +667,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -704,7 +704,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -778,7 +778,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -815,7 +815,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -959,7 +959,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -997,7 +997,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1106,7 +1106,7 @@ $result_trees{'multiple_include_encodings'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1231,7 +1231,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1268,7 +1268,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1440,7 +1440,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1477,7 +1477,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1789,7 +1789,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1826,7 +1826,7 @@ $result_trees{'multiple_include_encodings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 bac63f9ba0..8b87219157 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -81,7 +81,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 33ee38fdfb..6c8bca99e3 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -157,7 +157,7 @@ $result_trees{'sample_utf8'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -243,7 +243,7 @@ $result_trees{'sample_utf8'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -403,7 +403,7 @@ $result_trees{'sample_utf8'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -446,7 +446,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -483,7 +483,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -563,7 +563,7 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -789,7 +789,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -826,7 +826,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1029,7 +1029,7 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1173,7 +1173,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1210,7 +1210,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1265,7 +1265,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1303,7 +1303,7 @@ $result_trees{'sample_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 76c6d004de..2c4a5c9190 100644
--- a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
+++ b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
@@ -35,7 +35,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'verb_delimiter_not_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 4ee3262386..1538f65519 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -73,7 +73,7 @@ $result_trees{'weird_accents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'weird_accents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'weird_accents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -183,7 +183,7 @@ $result_trees{'weird_accents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index a46491272d..7fabfea26b 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -73,7 +73,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -183,7 +183,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 54b85fcba0..63bc5ad934 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'heading_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -235,7 +235,7 @@ $result_trees{'heading_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -271,7 +271,7 @@ $result_trees{'heading_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 1d9e0f32d1..6b8970094f 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'heading_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'heading',
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 5b71c62f4b..f620230179 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -24,7 +24,7 @@ $result_trees{'heading_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/html_tests/U_in_index.pl 
b/tp/t/results/html_tests/U_in_index.pl
index a65d587fe3..4372f9e978 100644
--- a/tp/t/results/html_tests/U_in_index.pl
+++ b/tp/t/results/html_tests/U_in_index.pl
@@ -30,7 +30,7 @@ $result_trees{'U_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'U_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'U_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -141,7 +141,7 @@ $result_trees{'U_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 1ce6641cb2..20130472ce 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
@@ -30,7 +30,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -180,7 +180,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -216,7 +216,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -315,7 +315,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -367,7 +367,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/anchor_on_vtable_item.pl 
b/tp/t/results/html_tests/anchor_on_vtable_item.pl
index 224d84f8a6..9769a4601e 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'anchor_on_vtable_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -487,7 +487,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -524,7 +524,7 @@ $result_trees{'anchor_on_vtable_item'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/automatic_menus.pl 
b/tp/t/results/html_tests/automatic_menus.pl
index 23821d1168..43164a54de 100644
--- a/tp/t/results/html_tests/automatic_menus.pl
+++ b/tp/t/results/html_tests/automatic_menus.pl
@@ -30,7 +30,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -170,7 +170,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {},
         {
@@ -211,7 +211,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -277,7 +277,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {},
         {
@@ -318,7 +318,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -354,7 +354,7 @@ $result_trees{'automatic_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 2fa996e7d3..9e2afc777b 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
@@ -35,7 +35,7 @@ $result_trees{'base_for_css_info_in_init_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'base_for_css_info_in_init_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index 19a25840c1..e701dc59a3 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -30,7 +30,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -63,7 +63,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -98,7 +98,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -131,7 +131,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index 14d7d21784..1f6f26f952 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -108,7 +108,7 @@ $result_trees{'check_htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -144,7 +144,7 @@ $result_trees{'check_htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -308,7 +308,7 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -548,7 +548,7 @@ $result_trees{'check_htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -648,7 +648,7 @@ $result_trees{'check_htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -684,7 +684,7 @@ $result_trees{'check_htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 4404972d66..af41dfe81d 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
@@ -108,7 +108,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -144,7 +144,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -308,7 +308,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -548,7 +548,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -648,7 +648,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -684,7 +684,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index bd3f8f7575..934c7da6ad 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -116,7 +116,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -152,7 +152,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -316,7 +316,7 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -556,7 +556,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -656,7 +656,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -692,7 +692,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 93d4ff7012..34ac89cebd 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
@@ -116,7 +116,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -152,7 +152,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -316,7 +316,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -556,7 +556,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -656,7 +656,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -692,7 +692,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 42b6a3b1ed..70e4725ae9 100644
--- a/tp/t/results/html_tests/command_in_node_redirection.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection.pl
@@ -35,7 +35,7 @@ $result_trees{'command_in_node_redirection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'command_in_node_redirection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/command_in_node_redirection_multiple.pl 
b/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
index bfd766e508..47244315c8 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
@@ -35,7 +35,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_other_command.pl 
b/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
index c736375228..b294c604d6 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
@@ -35,7 +35,7 @@ $result_trees{'command_in_node_redirection_other_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'command_in_node_redirection_other_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_same_command.pl 
b/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
index 7e7427e342..f7e867e0ab 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
@@ -35,7 +35,7 @@ $result_trees{'command_in_node_redirection_same_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'command_in_node_redirection_same_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl 
b/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
index f1a696aa9c..b3e45e9ef6 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
@@ -35,7 +35,7 @@ $result_trees{'command_in_node_redirection_two_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'command_in_node_redirection_two_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index b630442400..2cebee4a5e 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -83,7 +83,7 @@ $result_trees{'commands_in_abbr'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 48432d28c2..db7d10a5f2 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -82,7 +82,7 @@ $result_trees{'commands_in_alt'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/html_tests/contents_at_end.pl 
b/tp/t/results/html_tests/contents_at_end.pl
index 0e2cadd1da..aa797efa85 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_at_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_at_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_at_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_at_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_at_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_at_end_inline.pl 
b/tp/t/results/html_tests/contents_at_end_inline.pl
index 807d2ec144..483eb293f4 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_at_end_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_at_end_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_at_end_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_at_end_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_at_end_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_at_end_separate_element.pl 
b/tp/t/results/html_tests/contents_at_end_separate_element.pl
index 19e669ffaa..57b4a142c4 100644
--- a/tp/t/results/html_tests/contents_at_end_separate_element.pl
+++ b/tp/t/results/html_tests/contents_at_end_separate_element.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_at_end_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_at_end_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_at_end_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_at_end_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_at_end_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter.pl
index 70920ad522..80c40bf35f 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_in_middle_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -334,7 +334,7 @@ $result_trees{'contents_in_middle_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -459,7 +459,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -496,7 +496,7 @@ $result_trees{'contents_in_middle_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
index ebcaaa29c9..8c5cf8d163 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -334,7 +334,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -459,7 +459,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -496,7 +496,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index b53617c7dd..02662f3bf4 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_chapter_separate_element'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_chapter_separate_element'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -334,7 +334,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -459,7 +459,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -496,7 +496,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_in_middle_section.pl 
b/tp/t/results/html_tests/contents_in_middle_section.pl
index f281bb4ab1..bac45d529d 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_in_middle_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -310,7 +310,7 @@ $result_trees{'contents_in_middle_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -482,7 +482,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -519,7 +519,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -589,7 +589,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -626,7 +626,7 @@ $result_trees{'contents_in_middle_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
index 2ca6224c65..9770086f48 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -310,7 +310,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -482,7 +482,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -519,7 +519,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -589,7 +589,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -626,7 +626,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
index 6dd897ae43..c7c75b45c9 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
@@ -50,7 +50,7 @@ $result_trees{'contents_in_middle_section_separate_element'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_in_middle_section_separate_element'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -310,7 +310,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -482,7 +482,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -519,7 +519,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -589,7 +589,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -626,7 +626,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/contents_with_only_top_node.pl 
b/tp/t/results/html_tests/contents_with_only_top_node.pl
index 9111cd50bd..325077c8ba 100644
--- a/tp/t/results/html_tests/contents_with_only_top_node.pl
+++ b/tp/t/results/html_tests/contents_with_only_top_node.pl
@@ -45,7 +45,7 @@ $result_trees{'contents_with_only_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/css_in_node_redirection_page.pl 
b/tp/t/results/html_tests/css_in_node_redirection_page.pl
index e6627bcdb4..698b169d59 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
@@ -35,7 +35,7 @@ $result_trees{'css_in_node_redirection_page'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'css_in_node_redirection_page'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index cf4ffc435d..e1f319f1ac 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -24,7 +24,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deftypefun',
@@ -332,7 +332,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -368,7 +368,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -406,7 +406,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -442,7 +442,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 201237bd2a..c0a81e5b63 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -66,7 +66,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'deftypefun',
@@ -299,7 +299,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -335,7 +335,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -373,7 +373,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -409,7 +409,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index ba83b320e3..2dce797336 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -24,7 +24,7 @@ $result_trees{'documentdescription'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -249,7 +249,7 @@ $result_trees{'documentdescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index 9e3ccc2618..f6ddd860ad 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_after_title.pl 
b/tp/t/results/html_tests/double_contents_after_title.pl
index e100d1eb30..d95f5acd84 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_after_title'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_after_title'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
index 10142bae98..b65775710c 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git 
a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index 4e75775dd2..4da910e869 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_after_title_show_title_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_book.pl 
b/tp/t/results/html_tests/double_contents_book.pl
index fc46155a82..2fd0b01e68 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_book'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_book'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_book'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_chapter.pl 
b/tp/t/results/html_tests/double_contents_chapter.pl
index eafa39d09e..e35e347ceb 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_inline.pl 
b/tp/t/results/html_tests/double_contents_inline.pl
index b2a6700b60..0ac4130e73 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_inline_chapter.pl 
b/tp/t/results/html_tests/double_contents_inline_chapter.pl
index 002808d701..16a7a355b3 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_inline_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_inline_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_inline_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_inline_nodes.pl 
b/tp/t/results/html_tests/double_contents_inline_nodes.pl
index 8c7deba89b..62569b0169 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_inline_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_inline_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_inline_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_inline_section.pl 
b/tp/t/results/html_tests/double_contents_inline_section.pl
index 26d5cab54f..cdc376094f 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_inline_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_inline_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_inline_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_nodes.pl 
b/tp/t/results/html_tests/double_contents_nodes.pl
index b66e5e529a..5da7fdef09 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_section.pl 
b/tp/t/results/html_tests/double_contents_section.pl
index 64dd5bd5f1..681e6d9d4f 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_separate_element.pl 
b/tp/t/results/html_tests/double_contents_separate_element.pl
index 7aa60d4985..53b16391e2 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
index 7f6cb52504..5d7ac596ae 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_separate_element_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
index 6b73514f42..58827f6a58 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_section.pl 
b/tp/t/results/html_tests/double_contents_separate_element_section.pl
index 93e9ba8de5..840ffe5078 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_section.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_section.pl
@@ -72,7 +72,7 @@ $result_trees{'double_contents_separate_element_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -305,7 +305,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -356,7 +356,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'contents',
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 ac2d436564..e6431294ea 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
@@ -35,7 +35,7 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -132,7 +132,7 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -189,7 +189,7 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/empty_chapter_in_html_title.pl 
b/tp/t/results/html_tests/empty_chapter_in_html_title.pl
index b573767a71..6f28ba09b2 100644
--- a/tp/t/results/html_tests/empty_chapter_in_html_title.pl
+++ b/tp/t/results/html_tests/empty_chapter_in_html_title.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_chapter_in_html_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'empty_chapter_in_html_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'empty_chapter_in_html_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'empty_chapter_in_html_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl 
b/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
index 38557fe3f2..6b12242f4e 100644
--- 
a/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
+++ 
b/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
@@ -35,7 +35,7 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index c6f6715ece..6f73b69176 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -72,7 +72,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl 
b/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
index ec454ce0c6..20fe98441a 100644
--- a/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
+++ b/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -132,7 +132,7 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 e71caee7e4..f148d2504b 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
@@ -35,7 +35,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -215,7 +215,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -251,7 +251,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -327,7 +327,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -403,7 +403,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3d1b05c855..add289132c 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
@@ -35,7 +35,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -215,7 +215,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -251,7 +251,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -327,7 +327,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -367,7 +367,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -403,7 +403,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 8e656a871d..0f8391b2ad 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
@@ -35,7 +35,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -139,7 +139,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 8118a19bd9..73503cc6e1 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
@@ -35,7 +35,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/file_name_conflict_with_section.pl 
b/tp/t/results/html_tests/file_name_conflict_with_section.pl
index a647177a21..d945068b72 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
@@ -35,7 +35,7 @@ $result_trees{'file_name_conflict_with_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'file_name_conflict_with_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'anchor',
@@ -134,7 +134,7 @@ $result_trees{'file_name_conflict_with_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 b1c8e70b02..f52b6d1a6c 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
@@ -35,7 +35,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -215,7 +215,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -251,7 +251,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index 10dc8e2bb8..958e287b7b 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -35,7 +35,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index dfaf6c51ee..9003b19743 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -35,7 +35,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -181,7 +181,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index b5021ee137..9187011bb4 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -82,7 +82,7 @@ $result_trees{'float_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -120,7 +120,7 @@ $result_trees{'float_copying'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'text' => '
@@ -588,7 +588,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -625,7 +625,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -793,7 +793,7 @@ $result_trees{'float_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -916,7 +916,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -954,7 +954,7 @@ $result_trees{'float_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 bef5a42b84..75371b2104 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
@@ -69,7 +69,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -177,7 +177,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -213,7 +213,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index e9a78b30b2..b1a137e08e 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -27,7 +27,7 @@ $result_trees{'footnotestyle_separate_late'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -115,7 +115,7 @@ $result_trees{'footnotestyle_separate_late'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -153,7 +153,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -233,7 +233,7 @@ $result_trees{'footnotestyle_separate_late'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -271,7 +271,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/html_tests/fractions_rounding.pl 
b/tp/t/results/html_tests/fractions_rounding.pl
index 060b23a7b9..6b565f0473 100644
--- a/tp/t/results/html_tests/fractions_rounding.pl
+++ b/tp/t/results/html_tests/fractions_rounding.pl
@@ -55,7 +55,7 @@ $result_trees{'fractions_rounding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 318d61867c..8b364579ee 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -30,7 +30,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -180,7 +180,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'subheading',
@@ -263,7 +263,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -421,7 +421,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -488,7 +488,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in ignore
@@ -549,7 +549,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in iftex
@@ -672,7 +672,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -760,7 +760,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -782,7 +782,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -900,7 +900,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -922,7 +922,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1040,7 +1040,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1151,7 +1151,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1173,7 +1173,7 @@ $result_trees{'headings_after_lone_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1328,7 +1328,7 @@ $result_trees{'headings_after_lone_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 4cfec9151b..c1ffaaa76c 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -29,7 +29,7 @@ $result_trees{'html_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -60,7 +60,7 @@ $result_trees{'html_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -169,7 +169,7 @@ $result_trees{'html_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -205,7 +205,7 @@ $result_trees{'html_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index faa77c7c44..3d3095e86d 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -30,7 +30,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -63,7 +63,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 5a03fc1969..52595b298e 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -27,7 +27,7 @@ $result_trees{'index_below'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'index_below'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -120,7 +120,7 @@ $result_trees{'index_below'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/info_js_dir_html.pl 
b/tp/t/results/html_tests/info_js_dir_html.pl
index af30d05054..696d6af83b 100644
--- a/tp/t/results/html_tests/info_js_dir_html.pl
+++ b/tp/t/results/html_tests/info_js_dir_html.pl
@@ -30,7 +30,7 @@ $result_trees{'info_js_dir_html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'info_js_dir_html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'info_js_dir_html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'info_js_dir_html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/info_js_dir_html_file.pl 
b/tp/t/results/html_tests/info_js_dir_html_file.pl
index 3a55986e44..01b2a6392e 100644
--- a/tp/t/results/html_tests/info_js_dir_html_file.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_file.pl
@@ -35,7 +35,7 @@ $result_trees{'info_js_dir_html_file'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'info_js_dir_html_file'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'info_js_dir_html_file'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'info_js_dir_html_file'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl 
b/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
index 396d294778..3406cbca25 100644
--- a/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
@@ -35,7 +35,7 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/info_js_dir_html_text.pl 
b/tp/t/results/html_tests/info_js_dir_html_text.pl
index 2ec0b770a5..c9819797c7 100644
--- a/tp/t/results/html_tests/info_js_dir_html_text.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_text.pl
@@ -30,7 +30,7 @@ $result_trees{'info_js_dir_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'info_js_dir_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'info_js_dir_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'info_js_dir_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/inline_in_node.pl 
b/tp/t/results/html_tests/inline_in_node.pl
index cbc3ff5326..4ba7ba98f2 100644
--- a/tp/t/results/html_tests/inline_in_node.pl
+++ b/tp/t/results/html_tests/inline_in_node.pl
@@ -125,7 +125,7 @@ $result_trees{'inline_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -156,7 +156,7 @@ $result_trees{'inline_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -245,7 +245,7 @@ $result_trees{'inline_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -337,7 +337,7 @@ $result_trees{'inline_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index bdf2153426..aed26974fc 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -42,7 +42,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -133,7 +133,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -237,7 +237,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -347,7 +347,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -438,7 +438,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -529,7 +529,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -623,7 +623,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -766,7 +766,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -906,7 +906,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1025,7 +1025,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1133,7 +1133,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1238,7 +1238,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1343,7 +1343,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1440,7 +1440,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1537,7 +1537,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1637,7 +1637,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1748,7 +1748,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1856,7 +1856,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1969,7 +1969,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2088,7 +2088,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2201,7 +2201,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2320,7 +2320,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2470,7 +2470,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2657,7 +2657,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2908,7 +2908,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3223,7 +3223,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3529,7 +3529,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3729,7 +3729,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3848,7 +3848,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3973,7 +3973,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4114,7 +4114,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4239,7 +4239,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4355,7 +4355,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4474,7 +4474,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4617,7 +4617,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4736,7 +4736,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 3c1db05344..a50876ba7e 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -42,7 +42,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -133,7 +133,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -237,7 +237,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -347,7 +347,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -438,7 +438,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -529,7 +529,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -623,7 +623,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -766,7 +766,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -906,7 +906,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1025,7 +1025,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1133,7 +1133,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1238,7 +1238,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1343,7 +1343,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1440,7 +1440,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1537,7 +1537,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1637,7 +1637,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1748,7 +1748,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1856,7 +1856,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1969,7 +1969,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2088,7 +2088,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2201,7 +2201,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2320,7 +2320,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2470,7 +2470,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2657,7 +2657,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -2908,7 +2908,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3223,7 +3223,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3529,7 +3529,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3729,7 +3729,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3848,7 +3848,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -3973,7 +3973,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4114,7 +4114,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4239,7 +4239,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4355,7 +4355,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4474,7 +4474,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4617,7 +4617,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -4736,7 +4736,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/html_tests/itemize_tieaccent.pl 
b/tp/t/results/html_tests/itemize_tieaccent.pl
index 969bc7d2b5..9e5a8504c3 100644
--- a/tp/t/results/html_tests/itemize_tieaccent.pl
+++ b/tp/t/results/html_tests/itemize_tieaccent.pl
@@ -45,7 +45,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -192,7 +192,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -350,7 +350,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -500,7 +500,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -639,7 +639,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -775,7 +775,7 @@ $result_trees{'itemize_tieaccent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 6cc992075d..6837104953 100644
--- a/tp/t/results/html_tests/letter_command_in_index.pl
+++ b/tp/t/results/html_tests/letter_command_in_index.pl
@@ -30,7 +30,7 @@ $result_trees{'letter_command_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'letter_command_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'letter_command_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -141,7 +141,7 @@ $result_trees{'letter_command_in_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index 38350f43fd..2d624a9acb 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -24,7 +24,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a'
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 ff63756c38..ad0b5e2056 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
@@ -27,7 +27,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a'
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 131fc38d54..727e802a60 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
@@ -27,7 +27,7 @@ $result_trees{'mathjax_with_texinfo_html_file'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a'
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 38d366706d..6016639afd 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
@@ -24,7 +24,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a'
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 2eeb1bd24b..3d05a7b93b 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
@@ -24,7 +24,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a'
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 5ce3c2d746..2eb135bcc0 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -37,7 +37,7 @@ $result_trees{'menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -68,7 +68,7 @@ $result_trees{'menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -90,7 +90,7 @@ $result_trees{'menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -157,7 +157,7 @@ $result_trees{'menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
@@ -238,7 +238,7 @@ $result_trees{'menu'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -344,7 +344,7 @@ $result_trees{'menu'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'item',
@@ -430,7 +430,7 @@ $result_trees{'menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -516,7 +516,7 @@ $result_trees{'menu'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'item',
@@ -794,7 +794,7 @@ $result_trees{'menu'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -861,7 +861,7 @@ $result_trees{'menu'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'cmdname' => 'item',
@@ -942,7 +942,7 @@ $result_trees{'menu'} = {
                                       'type' => 'block_line_arg'
                                     }
                                   ],
-                                  'type' => 'argument'
+                                  'type' => 'arguments_line'
                                 },
                                 {
                                   'contents' => [
@@ -1048,7 +1048,7 @@ $result_trees{'menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
@@ -1134,7 +1134,7 @@ $result_trees{'menu'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -1220,7 +1220,7 @@ $result_trees{'menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
diff --git a/tp/t/results/html_tests/menu_in_documentdescription.pl 
b/tp/t/results/html_tests/menu_in_documentdescription.pl
index 03cb8b5f8f..45b20b173d 100644
--- a/tp/t/results/html_tests/menu_in_documentdescription.pl
+++ b/tp/t/results/html_tests/menu_in_documentdescription.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_in_documentdescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'menu_in_documentdescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'menu_in_documentdescription'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'menu',
@@ -105,7 +105,7 @@ $result_trees{'menu_in_documentdescription'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/html_tests/menu_in_example.pl 
b/tp/t/results/html_tests/menu_in_example.pl
index 6d2a6fcacb..0b1425d901 100644
--- a/tp/t/results/html_tests/menu_in_example.pl
+++ b/tp/t/results/html_tests/menu_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_in_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'menu_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'menu',
@@ -69,7 +69,7 @@ $result_trees{'menu_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -128,7 +128,7 @@ $result_trees{'menu_in_example'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -210,7 +210,7 @@ $result_trees{'menu_in_example'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
index fded42a98c..09190ada17 100644
--- a/tp/t/results/html_tests/no_content.pl
+++ b/tp/t/results/html_tests/no_content.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/no_content_do_contents.pl 
b/tp/t/results/html_tests/no_content_do_contents.pl
index 77439f5b54..0c9e27220a 100644
--- a/tp/t/results/html_tests/no_content_do_contents.pl
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content_do_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content_do_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content_do_contents'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content_do_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content_do_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/no_content_do_contents_inline.pl 
b/tp/t/results/html_tests/no_content_do_contents_inline.pl
index 0c2c3640b5..6fd46eaf99 100644
--- a/tp/t/results/html_tests/no_content_do_contents_inline.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_inline.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content_do_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content_do_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content_do_contents_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content_do_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content_do_contents_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
index 6bfc3f0a69..7f0adccc3f 100644
--- a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/no_content_inline.pl 
b/tp/t/results/html_tests/no_content_inline.pl
index 177232fefd..4e417d237c 100644
--- a/tp/t/results/html_tests/no_content_inline.pl
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content_inline'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content_inline'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/no_content_separate_element.pl 
b/tp/t/results/html_tests/no_content_separate_element.pl
index 4779041d4e..b0a4672fc3 100644
--- a/tp/t/results/html_tests/no_content_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -50,7 +50,7 @@ $result_trees{'no_content_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_content_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'no_content_separate_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'no_content_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'no_content_separate_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index 37e5f206be..50aff002f6 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -67,7 +67,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -89,7 +89,7 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -412,7 +412,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -549,7 +549,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -672,7 +672,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -709,7 +709,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -731,7 +731,7 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -884,7 +884,7 @@ $result_trees{'node_footnote_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 0514a672c0..60fba5a13a 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -67,7 +67,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -89,7 +89,7 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -412,7 +412,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -549,7 +549,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -672,7 +672,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -709,7 +709,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -731,7 +731,7 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -884,7 +884,7 @@ $result_trees{'node_footnote_separated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 2d99f03132..9d1fb26f60 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -67,7 +67,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -89,7 +89,7 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -412,7 +412,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -549,7 +549,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -672,7 +672,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -709,7 +709,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -731,7 +731,7 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -884,7 +884,7 @@ $result_trees{'node_footnote_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 08dc6192aa..f533f09e59 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
@@ -67,7 +67,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -89,7 +89,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -412,7 +412,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -549,7 +549,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -672,7 +672,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -709,7 +709,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -731,7 +731,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -884,7 +884,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/nodedescription_description.pl 
b/tp/t/results/html_tests/nodedescription_description.pl
index 9948acb10c..9676f0a7ca 100644
--- a/tp/t/results/html_tests/nodedescription_description.pl
+++ b/tp/t/results/html_tests/nodedescription_description.pl
@@ -35,7 +35,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -241,7 +241,7 @@ $result_trees{'nodedescription_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -321,7 +321,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -373,7 +373,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -393,7 +393,7 @@ $result_trees{'nodedescription_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -474,7 +474,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -520,7 +520,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -586,7 +586,7 @@ $result_trees{'nodedescription_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           '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 f526a8ff87..373a796aba 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
@@ -35,7 +35,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -241,7 +241,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -321,7 +321,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -373,7 +373,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -393,7 +393,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -474,7 +474,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -520,7 +520,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -586,7 +586,7 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/raw_html.pl 
b/tp/t/results/html_tests/raw_html.pl
index 5bef629c07..4f98d2528e 100644
--- a/tp/t/results/html_tests/raw_html.pl
+++ b/tp/t/results/html_tests/raw_html.pl
@@ -24,7 +24,7 @@ $result_trees{'raw_html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 89e33e45a1..f2074db09e 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -27,7 +27,7 @@ $result_trees{'redirection_same_labels'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'redirection_same_labels'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -263,7 +263,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -304,7 +304,7 @@ $result_trees{'redirection_same_labels'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -326,7 +326,7 @@ $result_trees{'redirection_same_labels'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -533,7 +533,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -583,7 +583,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -650,7 +650,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -695,7 +695,7 @@ $result_trees{'redirection_same_labels'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -717,7 +717,7 @@ $result_trees{'redirection_same_labels'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -852,7 +852,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -902,7 +902,7 @@ $result_trees{'redirection_same_labels'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index dbb0a50ec0..20a3149487 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -30,7 +30,7 @@ $result_trees{'ref_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'ref_in_preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -155,7 +155,7 @@ $result_trees{'ref_in_preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -272,7 +272,7 @@ $result_trees{'ref_in_preformatted'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 a79fb345ff..670c162cab 100644
--- a/tp/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -87,7 +87,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -119,7 +119,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -136,7 +136,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -641,7 +641,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -678,7 +678,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -709,7 +709,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -943,7 +943,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -980,7 +980,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1002,7 +1002,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1266,7 +1266,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1303,7 +1303,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1342,7 +1342,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1379,7 +1379,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1418,7 +1418,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1455,7 +1455,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1494,7 +1494,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1531,7 +1531,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1570,7 +1570,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1607,7 +1607,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1629,7 +1629,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1752,7 +1752,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1789,7 +1789,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1833,7 +1833,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1870,7 +1870,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1933,7 +1933,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2024,7 +2024,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2080,7 +2080,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2135,7 +2135,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2172,7 +2172,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2265,7 +2265,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/set_unit_file_name_filepath.pl 
b/tp/t/results/html_tests/set_unit_file_name_filepath.pl
index 6d09a256fe..0dcf9fa733 100644
--- a/tp/t/results/html_tests/set_unit_file_name_filepath.pl
+++ b/tp/t/results/html_tests/set_unit_file_name_filepath.pl
@@ -35,7 +35,7 @@ $result_trees{'set_unit_file_name_filepath'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'set_unit_file_name_filepath'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'set_unit_file_name_filepath'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'set_unit_file_name_filepath'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 8477ce1cde..f0c5408437 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -30,7 +30,7 @@ $result_trees{'shortcontents_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'shortcontents_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -110,7 +110,7 @@ $result_trees{'shortcontents_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index 035f49dbc0..46e6584a2b 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -107,7 +107,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -184,7 +184,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/simple_only_special_spaces_node.pl 
b/tp/t/results/html_tests/simple_only_special_spaces_node.pl
index 250757cf2d..9f6ab1b333 100644
--- a/tp/t/results/html_tests/simple_only_special_spaces_node.pl
+++ b/tp/t/results/html_tests/simple_only_special_spaces_node.pl
@@ -34,7 +34,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -70,7 +70,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -107,7 +107,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -143,7 +143,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -177,7 +177,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -205,7 +205,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -244,7 +244,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -280,7 +280,7 @@ $result_trees{'simple_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/html_tests/simplest_test_date_in_header.pl 
b/tp/t/results/html_tests/simplest_test_date_in_header.pl
index 62eedfc57b..5edc77ed7e 100644
--- a/tp/t/results/html_tests/simplest_test_date_in_header.pl
+++ b/tp/t/results/html_tests/simplest_test_date_in_header.pl
@@ -50,7 +50,7 @@ $result_trees{'simplest_test_date_in_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/split_html_text.pl 
b/tp/t/results/html_tests/split_html_text.pl
index 9b30f3d27f..4b011786b3 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -27,7 +27,7 @@ $result_trees{'split_html_text'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -68,7 +68,7 @@ $result_trees{'split_html_text'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -119,7 +119,7 @@ $result_trees{'split_html_text'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -157,7 +157,7 @@ $result_trees{'split_html_text'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
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 1d983c1c05..37680b02e8 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -50,7 +50,7 @@ $result_trees{'test_accents_sc_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'test_accents_sc_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'test_accents_sc_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index 17fcf7f134..c884f2a7bf 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
@@ -89,7 +89,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index fd7ef3ce62..9e88a847f8 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
@@ -89,7 +89,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
index dd06f6bbbb..3f8422e855 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
@@ -50,7 +50,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index 155c7cf791..1c51839680 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
@@ -89,7 +89,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
index 137dfbfd28..ff4b339b8c 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
@@ -89,7 +89,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
index 84ed06f2fb..b7aaa14855 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
@@ -89,7 +89,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 335ccca56c..55a1304c0c 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
@@ -89,7 +89,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 288314989c..21c67963ed 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
@@ -89,7 +89,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index 10e14c38ae..dd50790c9a 100644
--- a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -50,7 +50,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl 
b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
index ae288e862c..236e920fbf 100644
--- a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
+++ b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
@@ -56,7 +56,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -206,7 +206,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -242,7 +242,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index c81ecf495e..13499474f2 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -30,7 +30,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -243,7 +243,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 f2f847c109..3a74c49362 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -74,7 +74,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -110,7 +110,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -132,7 +132,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -287,7 +287,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 76023be930..b3cf391aba 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
@@ -40,7 +40,7 @@ $result_trees{'tex_expanded_in_caption_multiple_time'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -71,7 +71,7 @@ $result_trees{'tex_expanded_in_caption_multiple_time'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/html_tests/tex_expanded_in_copying.pl 
b/tp/t/results/html_tests/tex_expanded_in_copying.pl
index 9421ee058c..f41a56b07a 100644
--- a/tp/t/results/html_tests/tex_expanded_in_copying.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'tex_expanded_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'tex',
@@ -41,7 +41,7 @@ $result_trees{'tex_expanded_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 396a9427f0..1cd66362d8 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -51,7 +51,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -139,7 +139,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 7264487bf1..3e30e5d073 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -51,7 +51,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -139,7 +139,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/text_css_info_in_init.pl 
b/tp/t/results/html_tests/text_css_info_in_init.pl
index 48375ea2b2..c70018394f 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
@@ -35,7 +35,7 @@ $result_trees{'text_css_info_in_init'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'text_css_info_in_init'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index ee98cf08ea..5bd2525014 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -107,7 +107,7 @@ $result_trees{'titles'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -184,7 +184,7 @@ $result_trees{'titles'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl 
b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
index 038365e1c0..69653644c6 100644
--- a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
+++ b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
@@ -35,7 +35,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -147,7 +147,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -187,7 +187,7 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/top_node_top_contents.pl 
b/tp/t/results/html_tests/top_node_top_contents.pl
index c1f1093ad8..40995026e1 100644
--- a/tp/t/results/html_tests/top_node_top_contents.pl
+++ b/tp/t/results/html_tests/top_node_top_contents.pl
@@ -56,7 +56,7 @@ $result_trees{'top_node_top_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'top_node_top_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/html_tests/top_node_up_explicit.pl 
b/tp/t/results/html_tests/top_node_up_explicit.pl
index 26b510de23..b15f42b1ce 100644
--- a/tp/t/results/html_tests/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -106,7 +106,7 @@ $result_trees{'top_node_up_explicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -142,7 +142,7 @@ $result_trees{'top_node_up_explicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'top_node_up_explicit'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -297,7 +297,7 @@ $result_trees{'top_node_up_explicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -333,7 +333,7 @@ $result_trees{'top_node_up_explicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index 9b66a0c892..2e82fcb4a3 100644
--- a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
@@ -106,7 +106,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -142,7 +142,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -297,7 +297,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -333,7 +333,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/top_node_up_implicit.pl 
b/tp/t/results/html_tests/top_node_up_implicit.pl
index 33024e184e..0679b0088b 100644
--- a/tp/t/results/html_tests/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -30,7 +30,7 @@ $result_trees{'top_node_up_implicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'top_node_up_implicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -102,7 +102,7 @@ $result_trees{'top_node_up_implicit'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -221,7 +221,7 @@ $result_trees{'top_node_up_implicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -257,7 +257,7 @@ $result_trees{'top_node_up_implicit'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index f9daddd348..a353a12265 100644
--- a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
@@ -30,7 +30,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -102,7 +102,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -221,7 +221,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -257,7 +257,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl 
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 6316f2b448..357e4279f9 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -27,7 +27,7 @@ $result_trees{'transliterated_names_conflicts'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -89,7 +89,7 @@ $result_trees{'transliterated_names_conflicts'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -132,7 +132,7 @@ $result_trees{'transliterated_names_conflicts'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -171,7 +171,7 @@ $result_trees{'transliterated_names_conflicts'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -216,7 +216,7 @@ $result_trees{'transliterated_names_conflicts'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -255,7 +255,7 @@ $result_trees{'transliterated_names_conflicts'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -324,7 +324,7 @@ $result_trees{'transliterated_names_conflicts'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
diff --git a/tp/t/results/html_tests/undef_split_and_big_rule.pl 
b/tp/t/results/html_tests/undef_split_and_big_rule.pl
index 62675f87f7..d0f32d019a 100644
--- a/tp/t/results/html_tests/undef_split_and_big_rule.pl
+++ b/tp/t/results/html_tests/undef_split_and_big_rule.pl
@@ -44,7 +44,7 @@ $result_trees{'undef_split_and_big_rule'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'undef_split_and_big_rule'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'undef_split_and_big_rule'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -158,7 +158,7 @@ $result_trees{'undef_split_and_big_rule'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -194,7 +194,7 @@ $result_trees{'undef_split_and_big_rule'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index 940c5ad2ca..300c09f3c0 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'multitable',
@@ -70,7 +70,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -160,7 +160,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                       'type' => 'block_line_arg'
                                     }
                                   ],
-                                  'type' => 'argument'
+                                  'type' => 'arguments_line'
                                 },
                                 {
                                   'text' => 'in first column, verbatim
diff --git a/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl 
b/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
index c4cad1241d..61148fa0f4 100644
--- a/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
+++ b/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
@@ -30,7 +30,7 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 666747f666..1cc53ab573 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -24,7 +24,7 @@ $result_trees{'xml_protected_in_verb'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '<a>
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index b3c4185ded..b74ce3cb0b 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl 
b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
index 9431d38302..7dd26d74bb 100644
--- a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
+++ b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
@@ -35,7 +35,7 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index b27f32c895..d78355d79a 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 16996ba1ef..758f30b004 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 84b7d1be2f..2539f13f74 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 25c88a0788..5228c8468d 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref_only_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 122e88a61c..1eb93d7d28 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -966,7 +966,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1259,7 +1259,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1390,7 +1390,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1667,7 +1667,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1704,7 +1704,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1857,7 +1857,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1925,7 +1925,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2205,7 +2205,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2222,7 +2222,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2361,7 +2361,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2378,7 +2378,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'example',
@@ -2518,7 +2518,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/include/cpp_line_latin1.pl 
b/tp/t/results/include/cpp_line_latin1.pl
index a65a7cb725..8c5a984a01 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -89,7 +89,7 @@ $result_trees{'cpp_line_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'cpp_line_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -155,7 +155,7 @@ $result_trees{'cpp_line_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 5d6c8bfd2e..b9629c6bc8 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -124,7 +124,7 @@ $result_trees{'cpp_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -161,7 +161,7 @@ $result_trees{'cpp_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -201,7 +201,7 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -266,7 +266,7 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '# line 7 "k"
@@ -430,7 +430,7 @@ $result_trees{'cpp_lines'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'line before
diff --git a/tp/t/results/include/include_in_removed_before_item.pl 
b/tp/t/results/include/include_in_removed_before_item.pl
index 700ea78420..c4285a08d5 100644
--- a/tp/t/results/include/include_in_removed_before_item.pl
+++ b/tp/t/results/include/include_in_removed_before_item.pl
@@ -32,7 +32,7 @@ $result_trees{'include_in_removed_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/include/include_with_setfilename_in_preformatted.pl 
b/tp/t/results/include/include_with_setfilename_in_preformatted.pl
index 0439590b24..f126f23a6e 100644
--- a/tp/t/results/include/include_with_setfilename_in_preformatted.pl
+++ b/tp/t/results/include/include_with_setfilename_in_preformatted.pl
@@ -24,7 +24,7 @@ $result_trees{'include_with_setfilename_in_preformatted'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 0b7b9381f9..505c36f619 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro_i--n_pass@@
@@ -149,7 +149,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ISO-8859-1@@
@@ -276,7 +276,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro_included.texi
@@ -355,7 +355,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -391,7 +391,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -429,7 +429,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -499,7 +499,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in themacro
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index 72614be909..4cd8273767 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -60,7 +60,7 @@ $result_trees{'macro_definition_in_include'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in themacro
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 0b564600b5..abff2c101a 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro_in_pass
@@ -77,7 +77,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'texi_commands.\\ext\\
@@ -231,7 +231,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ISO-8859-1
@@ -293,7 +293,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@documentencoding
@@ -438,7 +438,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro_included.texi
@@ -517,7 +517,7 @@ $result_trees{'macro_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -553,7 +553,7 @@ $result_trees{'macro_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -591,7 +591,7 @@ $result_trees{'macro_in_early_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -661,7 +661,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in themacro
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index b569927aba..d9bf23685e 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -123,7 +123,7 @@ $result_trees{'value_expansion_in_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -159,7 +159,7 @@ $result_trees{'value_expansion_in_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 6e55e7037d..8c4e1a58b4 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -30,7 +30,7 @@ $result_trees{'complex_recursive_synindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'complex_recursive_synindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index ab1e83cf37..a0beda8796 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -75,7 +75,7 @@ $result_trees{'def_syn_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -111,7 +111,7 @@ $result_trees{'def_syn_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -149,7 +149,7 @@ $result_trees{'def_syn_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -186,7 +186,7 @@ $result_trees{'def_syn_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index 568e894069..eedfbbb9c3 100644
Binary files 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl and 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl differ
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 8f1fcb98f1..b3421e2ffc 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -35,7 +35,7 @@ $result_trees{'double_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'double_index_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -297,7 +297,7 @@ $result_trees{'double_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 254ba73fce..9fe819326d 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -35,7 +35,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -146,7 +146,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 485df18fdb..57d8066699 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -108,7 +108,7 @@ $result_trees{'double_syncodeindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -144,7 +144,7 @@ $result_trees{'double_syncodeindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/empty_added_index_entry.pl 
b/tp/t/results/indices/empty_added_index_entry.pl
index e0b66123ac..01ed517fe0 100644
--- a/tp/t/results/indices/empty_added_index_entry.pl
+++ b/tp/t/results/indices/empty_added_index_entry.pl
@@ -74,7 +74,7 @@ $result_trees{'empty_added_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -110,7 +110,7 @@ $result_trees{'empty_added_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 20ffa9a636..aeae3be3f5 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_cindex_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'empty_cindex_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 51d56ff4e1..ef5bcfe059 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'empty_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index c037b67ab4..4cecf2ce45 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_string_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'empty_string_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -150,7 +150,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 9dd78012e5..2947e011b7 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -118,7 +118,7 @@ $result_trees{'encoding_index_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -154,7 +154,7 @@ $result_trees{'encoding_index_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -187,7 +187,7 @@ $result_trees{'encoding_index_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 55c3b814e0..029724a778 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -118,7 +118,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -154,7 +154,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -187,7 +187,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 10852cdc98..90ea55a2ca 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -84,7 +84,7 @@ $result_trees{'encoding_index_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'encoding_index_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'encoding_index_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 78adbf6c20..88af602fbe 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -84,7 +84,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index a161613f42..2fe8059956 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -84,7 +84,7 @@ $result_trees{'encoding_index_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'encoding_index_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'encoding_index_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 a79cf70968..9477944d10 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -84,7 +84,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3dc2bf2fdd..51ad527c3f 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
@@ -84,7 +84,7 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -121,7 +121,7 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 319414674c..0998904185 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -35,7 +35,7 @@ $result_trees{'explicit_sort_key'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'explicit_sort_key'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'explicit_sort_key'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 43a95b1a2f..758b495405 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -45,7 +45,7 @@ $result_trees{'ftable_vtable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -81,7 +81,7 @@ $result_trees{'ftable_vtable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'ftable_vtable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -320,7 +320,7 @@ $result_trees{'ftable_vtable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 aa7d1577ee..e84c4d57d4 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -59,7 +59,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -90,7 +90,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index af86821b9a..ad747eac12 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 bccccbaec1..97fbf4d965 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/indices/index_and_node_same_name.pl 
b/tp/t/results/indices/index_and_node_same_name.pl
index bc1c2311d3..bffc543d11 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -35,7 +35,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -164,7 +164,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -201,7 +201,7 @@ $result_trees{'index_and_node_same_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index b2c4f64322..415862f106 100644
Binary files a/tp/t/results/indices/index_entries_before_nodes.pl and 
b/tp/t/results/indices/index_entries_before_nodes.pl differ
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 41652f3ea4..04b4bc829c 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -45,7 +45,7 @@ $result_trees{'index_entries_locations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -81,7 +81,7 @@ $result_trees{'index_entries_locations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 2044422695..cb9cde7abb 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 28958f35a5..9137699718 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -35,7 +35,7 @@ $result_trees{'index_entry_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -57,7 +57,7 @@ $result_trees{'index_entry_before_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -260,7 +260,7 @@ $result_trees{'index_entry_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -391,7 +391,7 @@ $result_trees{'index_entry_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index 45cdb0fdc7..240e320d1a 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 13d1684d93..a839a70cb5 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
@@ -35,7 +35,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -57,7 +57,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -225,7 +225,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -411,7 +411,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 ddde070526..852b7fa16d 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -35,7 +35,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -199,7 +199,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -236,7 +236,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 8b974f70c2..73dd82b964 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -35,7 +35,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -199,7 +199,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -236,7 +236,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 4c8b2a5df8..a353ad563b 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -69,7 +69,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -91,7 +91,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -259,7 +259,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -445,7 +445,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index d699b9dc7a..187e6e0e69 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -181,7 +181,7 @@ $result_trees{'index_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'printindex',
@@ -373,7 +373,7 @@ $result_trees{'index_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -726,7 +726,7 @@ $result_trees{'index_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -917,7 +917,7 @@ $result_trees{'index_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -1077,7 +1077,7 @@ $result_trees{'index_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index 4e65901b5d..4397fb04cd 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -138,7 +138,7 @@ $result_trees{'index_no_node_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'printindex',
@@ -330,7 +330,7 @@ $result_trees{'index_no_node_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -683,7 +683,7 @@ $result_trees{'index_no_node_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -874,7 +874,7 @@ $result_trees{'index_no_node_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -1034,7 +1034,7 @@ $result_trees{'index_no_node_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 597c8aaa59..0105f4ab95 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -138,7 +138,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'printindex',
@@ -330,7 +330,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -683,7 +683,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -874,7 +874,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -1034,7 +1034,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 30737a17d3..94c02ddbd9 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'index_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -237,7 +237,7 @@ $result_trees{'index_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -402,7 +402,7 @@ $result_trees{'index_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -619,7 +619,7 @@ $result_trees{'index_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -768,7 +768,7 @@ $result_trees{'index_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -785,7 +785,7 @@ $result_trees{'index_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1045,7 +1045,7 @@ $result_trees{'index_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1248,7 +1248,7 @@ $result_trees{'index_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index 29884c20a8..77c94787e8 100644
--- a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -237,7 +237,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -402,7 +402,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -619,7 +619,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -768,7 +768,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -785,7 +785,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1045,7 +1045,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1248,7 +1248,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index f82968ab6d..66ab1fa9a5 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -41,7 +41,7 @@ $result_trees{'index_special_region'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ $result_trees{'index_special_region'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ $result_trees{'index_special_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ $result_trees{'index_special_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ $result_trees{'index_special_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1030,7 +1030,7 @@ $result_trees{'index_special_region'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1165,7 +1165,7 @@ $result_trees{'index_special_region'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1290,7 +1290,7 @@ $result_trees{'index_special_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1328,7 +1328,7 @@ $result_trees{'index_special_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 b225f8c9c6..beaed8f29d 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -41,7 +41,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1025,7 +1025,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1160,7 +1160,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1285,7 +1285,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1323,7 +1323,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 477ab5ab6d..29fae10d18 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
@@ -41,7 +41,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1025,7 +1025,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1160,7 +1160,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1285,7 +1285,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1323,7 +1323,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 c27b17bf1c..5a4fdba8e0 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
@@ -41,7 +41,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1025,7 +1025,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1160,7 +1160,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1285,7 +1285,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1323,7 +1323,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 35a75643e0..213dc73b3d 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
@@ -41,7 +41,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1025,7 +1025,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1160,7 +1160,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1285,7 +1285,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1323,7 +1323,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 67d8a7b636..1034ff3c82 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
@@ -41,7 +41,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} = 
{
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1030,7 +1030,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1165,7 +1165,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1290,7 +1290,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1328,7 +1328,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 5870dad8e3..b70a3bf878 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
@@ -41,7 +41,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1030,7 +1030,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1165,7 +1165,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1290,7 +1290,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1328,7 +1328,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 08f4078a53..d8af898954 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
@@ -41,7 +41,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -333,7 +333,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -606,7 +606,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -643,7 +643,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -686,7 +686,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1030,7 +1030,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1165,7 +1165,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1290,7 +1290,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1328,7 +1328,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index b38473cb6d..6e0d60bcb5 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -50,7 +50,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -88,7 +88,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -275,7 +275,7 @@ $result_trees{'index_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -492,7 +492,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -815,7 +815,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'findex',
@@ -948,7 +948,7 @@ $result_trees{'index_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1308,7 +1308,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1346,7 +1346,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1410,7 +1410,7 @@ $result_trees{'index_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1671,7 +1671,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1708,7 +1708,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1763,7 +1763,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1801,7 +1801,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1978,7 +1978,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2015,7 +2015,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2070,7 +2070,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2108,7 +2108,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2264,7 +2264,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2379,7 +2379,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2655,7 +2655,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2739,7 +2739,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2776,7 +2776,7 @@ $result_trees{'index_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl 
b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
index 0bd57954f4..8beaf47b06 100644
--- a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
@@ -50,7 +50,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -88,7 +88,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -275,7 +275,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -492,7 +492,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -815,7 +815,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'findex',
@@ -948,7 +948,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1308,7 +1308,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1346,7 +1346,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1410,7 +1410,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1671,7 +1671,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1708,7 +1708,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1763,7 +1763,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1801,7 +1801,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1978,7 +1978,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2015,7 +2015,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2070,7 +2070,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2108,7 +2108,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2264,7 +2264,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2379,7 +2379,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2655,7 +2655,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2739,7 +2739,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2776,7 +2776,7 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index 1a94524dae..946ecaa4c2 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -50,7 +50,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -104,7 +104,7 @@ $result_trees{'index_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -321,7 +321,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -358,7 +358,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -498,7 +498,7 @@ $result_trees{'index_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -683,7 +683,7 @@ $result_trees{'index_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -922,7 +922,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -960,7 +960,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1105,7 +1105,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1143,7 +1143,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1160,7 +1160,7 @@ $result_trees{'index_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -6088,7 +6088,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6125,7 +6125,7 @@ $result_trees{'index_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl 
b/tp/t/results/indices/index_table_chapter_no_node.pl
index d926a69a89..6e77becb9b 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -50,7 +50,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -104,7 +104,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -321,7 +321,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -358,7 +358,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -498,7 +498,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -683,7 +683,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -922,7 +922,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -960,7 +960,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1105,7 +1105,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1143,7 +1143,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1160,7 +1160,7 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -6088,7 +6088,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -6125,7 +6125,7 @@ $result_trees{'index_table_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 780f035b84..0a036954a8 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -35,7 +35,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 610580a86f..d3891b0d47 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -122,7 +122,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -218,7 +218,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -565,7 +565,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -752,7 +752,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -917,7 +917,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1097,7 +1097,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1246,7 +1246,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1263,7 +1263,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1523,7 +1523,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
index 6d6d0ac2c8..110c77c161 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -100,7 +100,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -252,7 +252,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -401,7 +401,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -608,7 +608,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -820,7 +820,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -893,7 +893,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1148,7 +1148,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1328,7 +1328,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1477,7 +1477,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1494,7 +1494,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1754,7 +1754,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1957,7 +1957,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -2227,7 +2227,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2265,7 +2265,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2384,7 +2384,7 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index 7326665159..3d1b923ff2 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -100,7 +100,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -252,7 +252,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -401,7 +401,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -608,7 +608,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -820,7 +820,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -893,7 +893,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1148,7 +1148,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1328,7 +1328,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1477,7 +1477,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1494,7 +1494,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1754,7 +1754,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1957,7 +1957,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -2227,7 +2227,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2265,7 +2265,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2384,7 +2384,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index a03971c4f1..ecf667c8e6 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -100,7 +100,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -252,7 +252,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -401,7 +401,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -608,7 +608,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -820,7 +820,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -893,7 +893,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1148,7 +1148,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1328,7 +1328,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1477,7 +1477,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1494,7 +1494,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1754,7 +1754,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1957,7 +1957,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -2227,7 +2227,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2265,7 +2265,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2384,7 +2384,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter.pl
index 7862854813..aa4cafe399 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -122,7 +122,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -218,7 +218,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -565,7 +565,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -752,7 +752,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -917,7 +917,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1097,7 +1097,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1246,7 +1246,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1263,7 +1263,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1523,7 +1523,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'nodes_before_top_split_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
index b7e091fc06..531ac00817 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
@@ -122,7 +122,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -218,7 +218,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -565,7 +565,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -752,7 +752,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -917,7 +917,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -1097,7 +1097,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1246,7 +1246,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -1263,7 +1263,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1523,7 +1523,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1726,7 +1726,7 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index 2bff7259e4..9b51c5acaf 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -65,7 +65,7 @@ $result_trees{'print_merged_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -101,7 +101,7 @@ $result_trees{'print_merged_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'printindex',
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index 263e6590bc..0072d0355c 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -35,7 +35,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -258,7 +258,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -294,7 +294,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -411,7 +411,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'printindex',
@@ -480,7 +480,7 @@ $result_trees{'printindex_between_node_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 8b2169caea..46403c3d79 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -35,7 +35,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -72,7 +72,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -259,7 +259,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -334,7 +334,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -370,7 +370,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -411,7 +411,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -447,7 +447,7 @@ $result_trees{'printindex_between_part_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 56210097c9..682898e961 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -352,7 +352,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -583,7 +583,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -619,7 +619,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -669,7 +669,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -788,7 +788,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -825,7 +825,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 7d6a77efe6..f34ccfba46 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
@@ -26,7 +26,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -223,7 +223,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -259,7 +259,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -309,7 +309,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -428,7 +428,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -464,7 +464,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 2a1f611fc1..08d01d9634 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -26,7 +26,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -352,7 +352,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -583,7 +583,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -619,7 +619,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -655,7 +655,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -774,7 +774,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -811,7 +811,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 4520674dfd..dba705e8d9 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 2813e3ab61..eec47285ba 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -75,7 +75,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -106,7 +106,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -139,7 +139,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -176,7 +176,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index bcbb21a1ec..08eaca0462 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -35,7 +35,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -146,7 +146,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index efe5f485f0..d3cc680ed6 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -35,7 +35,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -146,7 +146,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 4e8b0809e0..c89c314050 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -35,7 +35,7 @@ $result_trees{'seealso_duplicate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'seealso_duplicate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 462b55adef..0804da23a0 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -35,7 +35,7 @@ $result_trees{'seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ $result_trees{'seeentry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index 109327df8c..642f40734e 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -35,7 +35,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -135,7 +135,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -943,7 +943,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -980,7 +980,7 @@ $result_trees{'sorted_subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index b3bb20502d..6b3df2dc97 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -93,7 +93,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -130,7 +130,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'cindex',
@@ -208,7 +208,7 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -331,7 +331,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -369,7 +369,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -749,7 +749,7 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -874,7 +874,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -911,7 +911,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -933,7 +933,7 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1142,7 +1142,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1179,7 +1179,7 @@ $result_trees{'split_chapter_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 4fbfdd78fd..e4fdea913f 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -35,7 +35,7 @@ $result_trees{'subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ $result_trees{'subentries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/subentries_and_comments.pl 
b/tp/t/results/indices/subentries_and_comments.pl
index 06ceeb5087..08d4abef7f 100644
--- a/tp/t/results/indices/subentries_and_comments.pl
+++ b/tp/t/results/indices/subentries_and_comments.pl
@@ -35,7 +35,7 @@ $result_trees{'subentries_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'subentries_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'subentries_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ $result_trees{'subentries_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 441c7f95af..d1479bc709 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -35,7 +35,7 @@ $result_trees{'subentry_and_sortas'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'subentry_and_sortas'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'subentry_and_sortas'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ $result_trees{'subentry_and_sortas'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index c6d9bcb165..44cf31da6b 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -35,7 +35,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -136,7 +136,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index eee35aba27..624edd618f 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -75,7 +75,7 @@ $result_trees{'syncode_index_print_both'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -111,7 +111,7 @@ $result_trees{'syncode_index_print_both'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -149,7 +149,7 @@ $result_trees{'syncode_index_print_both'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -186,7 +186,7 @@ $result_trees{'syncode_index_print_both'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index e412b34e28..bfbe0b5b6a 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -75,7 +75,7 @@ $result_trees{'syncodeindex_to_plain'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -111,7 +111,7 @@ $result_trees{'syncodeindex_to_plain'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index d145c35df6..52b44bff2e 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -59,7 +59,7 @@ $result_trees{'transparent_sort_chars'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -90,7 +90,7 @@ $result_trees{'transparent_sort_chars'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'transparent_sort_chars'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 764bf45310..047149af12 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 f67b395b32..604de6bd87 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_and_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'anchor_and_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'anchor',
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 9b12eff445..6371edbd5f 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index f1934b9dac..411f0c7510 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -160,7 +160,7 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'before_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -313,7 +313,7 @@ $result_trees{'before_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -411,7 +411,7 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -530,7 +530,7 @@ $result_trees{'before_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -567,7 +567,7 @@ $result_trees{'before_node_and_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index c9147dea15..0d3ce20b52 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -56,7 +56,7 @@ $result_trees{'center_flush'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -206,7 +206,7 @@ $result_trees{'center_flush'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl 
b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
index 1b186e09d1..7b0fcc385d 100644
--- a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
+++ b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
@@ -112,7 +112,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -149,7 +149,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -202,7 +202,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -239,7 +239,7 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index d3f7a09428..fa7fe89b05 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -30,7 +30,7 @@ $result_trees{'colon_in_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -139,7 +139,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 5539119d23..86f91c908b 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
@@ -35,7 +35,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -57,7 +57,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -295,7 +295,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -642,7 +642,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 07952626ab..b7daf03702 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
@@ -35,7 +35,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -57,7 +57,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -295,7 +295,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -642,7 +642,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 8473d2e5df..bcbcf5ee6a 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -20,7 +20,7 @@ $result_trees{'def_in_copying'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@deffn aa bb cc
@@ -109,7 +109,7 @@ $result_trees{'def_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -146,7 +146,7 @@ $result_trees{'def_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -168,7 +168,7 @@ $result_trees{'def_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index cc16fe0159..44a6350cb6 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -130,7 +130,7 @@ $result_trees{'direntry_dircategory'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -301,7 +301,7 @@ $result_trees{'direntry_dircategory'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -451,7 +451,7 @@ $result_trees{'direntry_dircategory'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -488,7 +488,7 @@ $result_trees{'direntry_dircategory'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -547,7 +547,7 @@ $result_trees{'direntry_dircategory'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -670,7 +670,7 @@ $result_trees{'direntry_dircategory'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -793,7 +793,7 @@ $result_trees{'direntry_dircategory'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -830,7 +830,7 @@ $result_trees{'direntry_dircategory'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 14a519a8fd..c2b728d3ca 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -70,7 +70,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -236,7 +236,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -380,7 +380,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -416,7 +416,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index c5db7ba45a..8700c94fe9 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -37,7 +37,7 @@ $result_trees{'empty_caption'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -72,7 +72,7 @@ $result_trees{'empty_caption'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/empty_copying_not_ended.pl 
b/tp/t/results/info_tests/empty_copying_not_ended.pl
index 92a3dcbd3b..88aa52b1a2 100644
--- a/tp/t/results/info_tests/empty_copying_not_ended.pl
+++ b/tp/t/results/info_tests/empty_copying_not_ended.pl
@@ -29,7 +29,7 @@ $result_trees{'empty_copying_not_ended'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'source_info' => {
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index 6e7927444b..73c868b0c4 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -73,7 +73,7 @@ $result_trees{'encoding_us_ascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index 1a6d9b3e91..7619c4c8af 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
@@ -35,7 +35,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -286,7 +286,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -323,7 +323,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -509,7 +509,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -545,7 +545,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -732,7 +732,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 5e478bf43e..15637704e0 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -37,7 +37,7 @@ $result_trees{'error_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -75,7 +75,7 @@ $result_trees{'error_in_footnote'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 1739d8561d..9aa9597a65 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 4b6b366232..99e1a87155 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -30,7 +30,7 @@ $result_trees{'float_long_captions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -68,7 +68,7 @@ $result_trees{'float_long_captions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'caption',
@@ -181,7 +181,7 @@ $result_trees{'float_long_captions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'caption',
diff --git a/tp/t/results/info_tests/float_without_type.pl 
b/tp/t/results/info_tests/float_without_type.pl
index b713457952..a6b8431712 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -37,7 +37,7 @@ $result_trees{'float_without_type'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -67,7 +67,7 @@ $result_trees{'float_without_type'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index 6342bb40f6..c973fb73ef 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 76385ae4a6..31dbb58540 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -30,7 +30,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index aa4273f88a..8a41b455a9 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 4f163ffdef..6e7d1d10f4 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 6abfa01c35..24b7e5050d 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -30,7 +30,7 @@ $result_trees{'image_not_found'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'image',
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 905fa4f35b..316c28bbfe 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_file_only_and_alt.pl 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl
index 64aff9a459..b23011c5f1 100644
Binary files a/tp/t/results/info_tests/image_text_file_only_and_alt.pl and 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl differ
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index da52967281..0c5abcddee 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -30,7 +30,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'index_entry_at_end_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -258,7 +258,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -294,7 +294,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -385,7 +385,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -422,7 +422,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3470b8264d..22bb88f09b 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
@@ -37,7 +37,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -59,7 +59,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -353,7 +353,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -408,7 +408,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -462,7 +462,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 ebd04dfb9c..cd04dc32da 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -37,7 +37,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -59,7 +59,7 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -353,7 +353,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -408,7 +408,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -462,7 +462,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index a2a312ae13..97ec8fbc87 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -73,7 +73,7 @@ $result_trees{'known_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 05e96fdbeb..26413d467c 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -228,7 +228,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -744,7 +744,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 78d59b048a..52dfaae212 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
@@ -30,7 +30,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -81,7 +81,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -452,7 +452,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 2055f71ab6..aa8dcecde4 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -64,7 +64,7 @@ $result_trees{'nested_footnotes_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index a7664da0d8..ef7ff41471 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -30,7 +30,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -79,7 +79,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index c981650279..fa41747e3a 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -30,7 +30,7 @@ $result_trees{'no_node_but_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index e90001d7f0..1742ca4004 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -30,7 +30,7 @@ $result_trees{'no_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 00a01e6cbf..f03d252aa8 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -30,7 +30,7 @@ $result_trees{'note_in_strong'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index b55c5d27f4..28acda9ea8 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
@@ -30,7 +30,7 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 989d218ad9..d0c229a677 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -55,7 +55,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -169,7 +169,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
@@ -201,7 +201,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
@@ -246,7 +246,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
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 e7ec53888c..a154e01882 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -108,7 +108,7 @@ $result_trees{'one_node_counted_elements'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -212,7 +212,7 @@ $result_trees{'one_node_counted_elements'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 4a8fe2aa1a..e9612457f4 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -26,7 +26,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -168,7 +168,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -210,7 +210,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
index 0c9e2454ed..6b6953f5bf 100644
--- a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
@@ -26,7 +26,7 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -168,7 +168,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -210,7 +210,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
index e485b525f6..a5adf833c8 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -26,7 +26,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -117,7 +117,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -159,7 +159,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 06b0d5c1c9..d47b500408 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -30,7 +30,7 @@ $result_trees{'pxref_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 2e3f3241c5..0dc1435df1 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -35,7 +35,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -67,7 +67,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1015,7 +1015,7 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1441,7 +1441,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1478,7 +1478,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1533,7 +1533,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1570,7 +1570,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1748,7 +1748,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1785,7 +1785,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1840,7 +1840,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1891,7 +1891,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1932,7 +1932,7 @@ $result_trees{'quote_node_names_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/recursive_down_menu.pl 
b/tp/t/results/info_tests/recursive_down_menu.pl
index 256c2339fe..4c59bc3776 100644
--- a/tp/t/results/info_tests/recursive_down_menu.pl
+++ b/tp/t/results/info_tests/recursive_down_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'recursive_down_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'recursive_down_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'recursive_down_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'recursive_down_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -162,7 +162,7 @@ $result_trees{'recursive_down_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 536c194508..0bd6dc06b5 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -37,7 +37,7 @@ $result_trees{'ref_tests'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 aa1e8a3369..e1b3ac5123 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
@@ -63,7 +63,7 @@ $result_trees{'similar_external_and_internal_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index eb76970312..92b129f9ed 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -30,7 +30,7 @@ $result_trees{'space_at_menu_end'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'space_at_menu_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index f81f820529..e586fd2124 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'space_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'space_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -102,7 +102,7 @@ $result_trees{'space_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -221,7 +221,7 @@ $result_trees{'space_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -257,7 +257,7 @@ $result_trees{'space_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 5a8186d68d..9dc3c7ed09 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -87,7 +87,7 @@ $result_trees{'space_in_setfilename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 79d44031b6..eb06299eab 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -76,7 +76,7 @@ $result_trees{'split_no_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -112,7 +112,7 @@ $result_trees{'split_no_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -148,7 +148,7 @@ $result_trees{'split_no_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -267,7 +267,7 @@ $result_trees{'split_no_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -303,7 +303,7 @@ $result_trees{'split_no_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
index d26557cab3..292b94debf 100644
--- a/tp/t/results/info_tests/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -50,7 +50,7 @@ $result_trees{'split_nocopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -93,7 +93,7 @@ $result_trees{'split_nocopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -129,7 +129,7 @@ $result_trees{'split_nocopying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'split_nocopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -289,7 +289,7 @@ $result_trees{'split_nocopying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/split_nocopying_split.pl 
b/tp/t/results/info_tests/split_nocopying_split.pl
index d4a4b3f798..849d8be72b 100644
--- a/tp/t/results/info_tests/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -50,7 +50,7 @@ $result_trees{'split_nocopying_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -93,7 +93,7 @@ $result_trees{'split_nocopying_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -129,7 +129,7 @@ $result_trees{'split_nocopying_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'split_nocopying_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -289,7 +289,7 @@ $result_trees{'split_nocopying_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index 6c31b6c2ec..aa1d8eb5ae 100644
--- a/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -86,7 +86,7 @@ $result_trees{'split_test_before_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -122,7 +122,7 @@ $result_trees{'split_test_before_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -158,7 +158,7 @@ $result_trees{'split_test_before_first_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -277,7 +277,7 @@ $result_trees{'split_test_before_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -313,7 +313,7 @@ $result_trees{'split_test_before_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 6b496c7de4..755afb19df 100644
--- a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -81,7 +81,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -117,7 +117,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -272,7 +272,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -308,7 +308,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 07e85b387f..9726057c87 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -30,7 +30,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -596,7 +596,7 @@ $result_trees{'test_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -812,7 +812,7 @@ $result_trees{'test_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -977,7 +977,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1013,7 +1013,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2386,7 +2386,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2423,7 +2423,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2646,7 +2646,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2686,7 +2686,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2726,7 +2726,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2799,7 +2799,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2837,7 +2837,7 @@ $result_trees{'test_index'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index 5dcb4847ef..228f363e7d 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -30,7 +30,7 @@ $result_trees{'text_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'text_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'text_before_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -216,7 +216,7 @@ $result_trees{'text_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -246,7 +246,7 @@ $result_trees{'text_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 1b50631ceb..c1da8988e6 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -30,7 +30,7 @@ $result_trees{'top_node_normalization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -117,7 +117,7 @@ $result_trees{'top_node_normalization'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
index ad8ec6f225..ead1678c29 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -26,7 +26,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -205,7 +205,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -247,7 +247,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
index 712459deb5..45af5e13f6 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
@@ -26,7 +26,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -205,7 +205,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -247,7 +247,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index 7f164923ba..5173a16876 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -72,7 +72,7 @@ $result_trees{'unknown_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3ac74b550e..d7d660fb85 100644
--- a/tp/t/results/info_tests/xref_quote_long_item.pl
+++ b/tp/t/results/info_tests/xref_quote_long_item.pl
@@ -32,7 +32,7 @@ $result_trees{'xref_quote_long_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index e9816e8d79..b0742df145 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -37,7 +37,7 @@ $result_trees{'xref_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/init_files_tests/access_document_name_in_handler.pl 
b/tp/t/results/init_files_tests/access_document_name_in_handler.pl
index 8b4d307f81..8a3e28b20f 100644
--- a/tp/t/results/init_files_tests/access_document_name_in_handler.pl
+++ b/tp/t/results/init_files_tests/access_document_name_in_handler.pl
@@ -35,7 +35,7 @@ $result_trees{'access_document_name_in_handler'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'access_document_name_in_handler'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'access_document_name_in_handler'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'access_document_name_in_handler'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
 
b/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
index 5319e9f8e7..6eca09c387 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
@@ -56,7 +56,7 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
 
b/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
index d1e1886146..ca09aba19c 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
@@ -56,7 +56,7 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
 
b/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
index 1f0a7f310f..32c204995b 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
@@ -56,7 +56,7 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 8af1251fea..8cfd47b52d 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -80,7 +80,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -116,7 +116,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -154,7 +154,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -190,7 +190,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -260,7 +260,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -296,7 +296,7 @@ $result_trees{'customize_special_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 3ec579bc85..4fbe9de07d 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -66,7 +66,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -102,7 +102,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -140,7 +140,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -176,7 +176,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -307,7 +307,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -478,7 +478,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -514,7 +514,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -579,7 +579,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -615,7 +615,7 @@ $result_trees{'customize_translations'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/init_files_tests/directions_string_base.pl 
b/tp/t/results/init_files_tests/directions_string_base.pl
index 660e06a92b..c82d3a6df8 100644
--- a/tp/t/results/init_files_tests/directions_string_base.pl
+++ b/tp/t/results/init_files_tests/directions_string_base.pl
@@ -35,7 +35,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -185,7 +185,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -261,7 +261,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -297,7 +297,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -337,7 +337,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -373,7 +373,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -413,7 +413,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'directions_string_base'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/init_files_tests/directions_string_undef.pl 
b/tp/t/results/init_files_tests/directions_string_undef.pl
index d7aac83c45..86b578771d 100644
--- a/tp/t/results/init_files_tests/directions_string_undef.pl
+++ b/tp/t/results/init_files_tests/directions_string_undef.pl
@@ -35,7 +35,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -185,7 +185,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -261,7 +261,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -297,7 +297,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -337,7 +337,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -373,7 +373,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -413,7 +413,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'directions_string_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl 
b/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
index 13dc97c546..e39fc347b2 100644
--- a/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
+++ b/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
@@ -35,7 +35,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -185,7 +185,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -261,7 +261,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -297,7 +297,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -337,7 +337,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -373,7 +373,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -413,7 +413,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'directions_string_undef_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 44a877ee8a..a7e86bc35f 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -177,7 +177,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -251,7 +251,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -287,7 +287,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -605,7 +605,7 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -622,7 +622,7 @@ $result_trees{'documentation_examples'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -799,7 +799,7 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -887,7 +887,7 @@ $result_trees{'documentation_examples'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\frac'
@@ -1255,7 +1255,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1291,7 +1291,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1416,7 +1416,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1453,7 +1453,7 @@ $result_trees{'documentation_examples'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 bcb69fe912..42744c1717 100644
--- a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
+++ b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
@@ -177,7 +177,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -251,7 +251,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -287,7 +287,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -605,7 +605,7 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -622,7 +622,7 @@ $result_trees{'documentation_examples_texi2html'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -799,7 +799,7 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -887,7 +887,7 @@ $result_trees{'documentation_examples_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\frac'
@@ -1255,7 +1255,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1291,7 +1291,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1416,7 +1416,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1453,7 +1453,7 @@ $result_trees{'documentation_examples_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/init_files_tests/redefined_buttons_functions.pl 
b/tp/t/results/init_files_tests/redefined_buttons_functions.pl
index 4ccd8853ab..e666c26dea 100644
--- a/tp/t/results/init_files_tests/redefined_buttons_functions.pl
+++ b/tp/t/results/init_files_tests/redefined_buttons_functions.pl
@@ -35,7 +35,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -185,7 +185,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -261,7 +261,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -297,7 +297,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -337,7 +337,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -373,7 +373,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -413,7 +413,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'redefined_buttons_functions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl 
b/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
index a8387aba64..9ceafa2a38 100644
--- a/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
+++ b/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
@@ -56,7 +56,7 @@ $result_trees{'ref_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'ref_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ $result_trees{'ref_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ $result_trees{'ref_for_special_unit_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 39314e0f3b..b9a498d0ad 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
@@ -105,7 +105,7 @@ $result_trees{'sc_formatting_with_css'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/init_files_tests/special_unit_direction_customization.pl 
b/tp/t/results/init_files_tests/special_unit_direction_customization.pl
index 847ec2ee6a..5eef1d472b 100644
--- a/tp/t/results/init_files_tests/special_unit_direction_customization.pl
+++ b/tp/t/results/init_files_tests/special_unit_direction_customization.pl
@@ -56,7 +56,7 @@ $result_trees{'special_unit_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'special_unit_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -130,7 +130,7 @@ $result_trees{'special_unit_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ $result_trees{'special_unit_direction_customization'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 5786f0e272..eabed8d3dc 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
@@ -35,7 +35,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -231,7 +231,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -372,7 +372,7 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'author',
diff --git 
a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl 
b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
index 2ff57ba196..3773b4b1f8 100644
--- a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -72,7 +72,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -182,7 +182,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/init_files_tests/undefined_node_filename.pl 
b/tp/t/results/init_files_tests/undefined_node_filename.pl
index 676e73b6f9..868dcc5d64 100644
--- a/tp/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tp/t/results/init_files_tests/undefined_node_filename.pl
@@ -35,7 +35,7 @@ $result_trees{'undefined_node_filename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'undefined_node_filename'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/init_files_tests/unknown_custom_variable.pl 
b/tp/t/results/init_files_tests/unknown_custom_variable.pl
index d3617dbe1c..8aba2cd847 100644
--- a/tp/t/results/init_files_tests/unknown_custom_variable.pl
+++ b/tp/t/results/init_files_tests/unknown_custom_variable.pl
@@ -30,7 +30,7 @@ $result_trees{'unknown_custom_variable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'unknown_custom_variable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'unknown_custom_variable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'unknown_custom_variable'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index 9a6d3c2b4d..1d7e022527 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -46,7 +46,7 @@ $result_trees{'bad_style_nesting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 3fda4796d3..c58e53ae26 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -51,7 +51,7 @@ $result_trees{'bad_tab_nesting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 6290c07fe0..1625d21693 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -24,7 +24,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -190,7 +190,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -284,7 +284,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -337,7 +337,7 @@ $result_trees{'block_not_matching'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -392,7 +392,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -428,7 +428,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -464,7 +464,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -500,7 +500,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 ea11ba2a41..754cdb698b 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -46,7 +46,7 @@ $result_trees{'cartouche_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index e3d6479d9a..5c58a210d1 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -191,7 +191,7 @@ $result_trees{'center'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     }
                   ],
                   'source_info' => {
@@ -475,7 +475,7 @@ $result_trees{'center'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'center'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -948,7 +948,7 @@ $result_trees{'center'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1158,7 +1158,7 @@ $result_trees{'center'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     }
                   ],
                   'extra' => {
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index 9e4c7adbad..c1a688e479 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -24,7 +24,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 9ded4a99b6..df017f899f 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -51,7 +51,7 @@ $result_trees{'enumerate_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 54d7fca2ee..a2f55ec70a 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -46,7 +46,7 @@ $result_trees{'example_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 8f4527a43b..8a09699ae0 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -62,7 +62,7 @@ $result_trees{'float_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 a039f0cc00..713bbeef6b 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -46,7 +46,7 @@ $result_trees{'flushright_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index c7fcde6089..fbeb6e61a5 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'footnote_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl 
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index eac2ff2c0f..55f1814ae2 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -59,7 +59,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 9dd335c515..2581e3b86c 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -30,7 +30,7 @@ $result_trees{'ignore_in_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -75,7 +75,7 @@ $result_trees{'ignore_in_xref'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'text' => 'ignore me
diff --git a/tp/t/results/invalid_nestings/ignored_text.pl 
b/tp/t/results/invalid_nestings/ignored_text.pl
index 6e07930094..6555108897 100644
--- a/tp/t/results/invalid_nestings/ignored_text.pl
+++ b/tp/t/results/invalid_nestings/ignored_text.pl
@@ -41,7 +41,7 @@ $result_trees{'ignored_text'} = {
                                 'type' => 'block_line_arg'
                               }
                             ],
-                            'type' => 'argument'
+                            'type' => 'arguments_line'
                           }
                         ],
                         'source_info' => {
@@ -58,7 +58,7 @@ $result_trees{'ignored_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 9b1b0b32a5..37deba4af1 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -157,7 +157,7 @@ $result_trees{'in_errormsg'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index f879b35e7d..83d664d87c 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -37,7 +37,7 @@ $result_trees{'in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -103,7 +103,7 @@ $result_trees{'in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -176,7 +176,7 @@ $result_trees{'in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -612,7 +612,7 @@ $result_trees{'in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 05fa03cac1..d2e842a19d 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -32,7 +32,7 @@ $result_trees{'item_in_ref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index 1fdbb3fccd..338078a1d9 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -32,7 +32,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -107,7 +107,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
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 023a28f353..6bf02b72d5 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_in_style_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'menu_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 37ec453254..fbee6a13dd 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -77,7 +77,7 @@ $result_trees{'multitable_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index b0183d0dd4..5992913dd0 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_item_in_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index 8485fdee0c..e3d060ba20 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'node_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'source_info' => {
@@ -54,7 +54,7 @@ $result_trees{'node_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 919c9fff0e..719b6482bf 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'node_in_copying_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -78,7 +78,7 @@ $result_trees{'node_in_copying_not_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -114,7 +114,7 @@ $result_trees{'node_in_copying_not_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index 6db38b20b2..069f7a4ca3 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -174,7 +174,7 @@ $result_trees{'node_on_index_entry_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 dbc0a1bb3b..48938a69d4 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -74,7 +74,7 @@ $result_trees{'on_block_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -286,7 +286,7 @@ $result_trees{'on_block_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 0883f53e37..ed893d6ad1 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -122,7 +122,7 @@ $result_trees{'on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -220,7 +220,7 @@ $result_trees{'on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index 6bbf724e64..d879c6e57a 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -227,7 +227,7 @@ $result_trees{'on_node_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 1a3cdd3398..cf8ca787ca 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -126,7 +126,7 @@ $result_trees{'on_section_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index b654a589d4..f767b5f765 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'quotation_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'quotation_in_ref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 2db694364c..8f22ab2664 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -46,7 +46,7 @@ $result_trees{'quotation_in_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/raw_block_on_line.pl 
b/tp/t/results/invalid_nestings/raw_block_on_line.pl
index 00466583c1..ba5c52977c 100644
--- a/tp/t/results/invalid_nestings/raw_block_on_line.pl
+++ b/tp/t/results/invalid_nestings/raw_block_on_line.pl
@@ -29,7 +29,7 @@ $result_trees{'raw_block_on_line'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     }
                   ],
                   'source_info' => {
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index d7e64a8c32..a109fe0664 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'recursive_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index ef9402aa9e..3385ad2d3b 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'ref_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
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 4d4d23a0e1..89b6f9cce2 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,7 +30,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index 92120220f8..21dff282bc 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'section_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -73,7 +73,7 @@ $result_trees{'section_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index dcce3254fd..464f558e47 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -24,7 +24,7 @@ $result_trees{'section_in_flushright'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -73,7 +73,7 @@ $result_trees{'section_in_flushright'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index b26f3c3415..ccb4d3a618 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -69,7 +69,7 @@ $result_trees{'section_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index 55ef9c701d..8fb72cb19e 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -81,7 +81,7 @@ $result_trees{'section_in_math'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -156,7 +156,7 @@ $result_trees{'section_in_math'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index f36c130044..13f396e5b7 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -32,7 +32,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'text' => '
@@ -167,7 +167,7 @@ $result_trees{'section_in_nested_block_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 85e60715c0..7fddb38f74 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -32,7 +32,7 @@ $result_trees{'section_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -117,7 +117,7 @@ $result_trees{'section_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl 
b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
index 615416470c..54b65eaf95 100644
--- a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
@@ -18,7 +18,7 @@ $result_trees{'section_on_cartouche_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'source_info' => {
@@ -48,7 +48,7 @@ $result_trees{'section_on_cartouche_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -64,7 +64,7 @@ $result_trees{'section_on_cartouche_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'info' => {
@@ -109,7 +109,7 @@ $result_trees{'section_on_cartouche_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 2120c30f4a..b8b911eaea 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -114,7 +114,7 @@ $result_trees{'section_on_def_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index ffd18b2765..5471a3e6bc 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -223,7 +223,7 @@ $result_trees{'section_on_defx_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl 
b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
index fe6793541f..433241aeb8 100644
--- a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -28,7 +28,7 @@ $result_trees{'section_on_enumerate_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'section_on_enumerate_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -92,7 +92,7 @@ $result_trees{'section_on_enumerate_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'section_on_enumerate_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_on_float_line.pl 
b/tp/t/results/invalid_nestings/section_on_float_line.pl
index 6a2fadb0f4..d522afb015 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -39,7 +39,7 @@ $result_trees{'section_on_float_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -79,7 +79,7 @@ $result_trees{'section_on_float_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index 9698fb53b1..464c40f218 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -66,7 +66,7 @@ $result_trees{'section_on_index_entry_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           '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 3a4bcb09e7..52df8fabf1 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -36,7 +36,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -74,7 +74,7 @@ $result_trees{'section_on_itemize_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'info' => {
@@ -156,7 +156,7 @@ $result_trees{'section_on_itemize_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -180,7 +180,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -228,7 +228,7 @@ $result_trees{'section_on_itemize_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -257,7 +257,7 @@ $result_trees{'section_on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'info' => {
@@ -302,7 +302,7 @@ $result_trees{'section_on_itemize_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 fde3834120..414e4bf460 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -18,7 +18,7 @@ $result_trees{'section_on_multitable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -56,7 +56,7 @@ $result_trees{'section_on_multitable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -95,7 +95,7 @@ $result_trees{'section_on_multitable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -143,7 +143,7 @@ $result_trees{'section_on_multitable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -191,7 +191,7 @@ $result_trees{'section_on_multitable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -239,7 +239,7 @@ $result_trees{'section_on_multitable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl 
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index d39328b2b6..1b6cf16189 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -26,7 +26,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -64,7 +64,7 @@ $result_trees{'section_on_xtable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -99,7 +99,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -147,7 +147,7 @@ $result_trees{'section_on_xtable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -176,7 +176,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -224,7 +224,7 @@ $result_trees{'section_on_xtable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -259,7 +259,7 @@ $result_trees{'section_on_xtable_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
@@ -307,7 +307,7 @@ $result_trees{'section_on_xtable_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 6090f8f633..0cdb6146e1 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
@@ -59,7 +59,7 @@ $result_trees{'style_not_closed_before_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
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 d01ce59c5a..d7aaa5c146 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
@@ -24,7 +24,7 @@ $result_trees{'style_not_closed_in_block_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 818085fb94..212c7e51ee 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
@@ -32,7 +32,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index 821892ee98..aa83728d2e 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
@@ -30,7 +30,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -229,7 +229,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -265,7 +265,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 e6e2d2edfe..390e238cae 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
@@ -30,7 +30,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'style_not_closed_root_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -234,7 +234,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -270,7 +270,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 0b1cef9d98..de7925df69 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -51,7 +51,7 @@ $result_trees{'tab_in_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index f78a507608..bb0f4675e1 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -58,7 +58,7 @@ $result_trees{'table_in_code'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index ab5ff3b998..609c4cde94 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -112,7 +112,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git 
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index a3d53d7b27..cc5499aa7c 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -24,7 +24,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl 
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index d7f5ee34be..8f57b73ba1 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -32,7 +32,7 @@ $result_trees{'table_on_item_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -69,7 +69,7 @@ $result_trees{'table_on_item_line'} = {
                                       'type' => 'block_line_arg'
                                     }
                                   ],
-                                  'type' => 'argument'
+                                  'type' => 'arguments_line'
                                 }
                               ],
                               'extra' => {
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 9c4e2d7af9..a42af82b02 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
@@ -55,7 +55,7 @@ $result_trees{'unclosed_verb_on_section_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 1aef176eb5..13092eb0f5 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'verbatim_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'verbatim_in_ref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'verbat text
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 21137f3fcc..752a8c4f5c 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -42,7 +42,7 @@ $result_trees{'accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -146,7 +146,7 @@ $result_trees{'accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -255,7 +255,7 @@ $result_trees{'accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index 9ac5a660df..8c10514745 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -32,7 +32,7 @@ $result_trees{'asis_as_itemize_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index e9b514df59..defadfaf1c 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -29,7 +29,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -99,7 +99,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -182,7 +182,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -255,7 +255,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -325,7 +325,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl 
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index 19b0d5c02d..ae6ee18d52 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -30,7 +30,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 012682f923..d20b7f4e5c 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -38,7 +38,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index 03bc24d885..a9025b13e0 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -38,7 +38,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -132,7 +132,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -231,7 +231,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -325,7 +325,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 96e45647e8..31d6d5a2da 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -24,7 +24,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -73,7 +73,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -194,7 +194,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -358,7 +358,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -470,7 +470,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index 356a1477ee..21eaa9882c 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -105,7 +105,7 @@ $result_trees{'enumerate_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -184,7 +184,7 @@ $result_trees{'enumerate_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -254,7 +254,7 @@ $result_trees{'enumerate_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index 71c6d94b43..c2f368262b 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_argument_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -153,7 +153,7 @@ $result_trees{'enumerate_argument_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -280,7 +280,7 @@ $result_trees{'enumerate_argument_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -398,7 +398,7 @@ $result_trees{'enumerate_argument_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index a3ca783afe..3b30eedc1b 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'enumerate',
@@ -46,7 +46,7 @@ $result_trees{'enumerate_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index c86ad86ca0..770d1b25b1 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_letters'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/enumerate_more_letters.pl 
b/tp/t/results/itemize/enumerate_more_letters.pl
index 3f09e5dc87..28514f07e5 100644
--- a/tp/t/results/itemize/enumerate_more_letters.pl
+++ b/tp/t/results/itemize/enumerate_more_letters.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_more_letters'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index b7b70a5e72..ff17bd7fe6 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -24,7 +24,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index a2da4fa726..48a8dc7ae8 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -32,7 +32,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 5ca46e7f9d..d273db04b4 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -35,7 +35,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -167,7 +167,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -406,7 +406,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -536,7 +536,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -666,7 +666,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -800,7 +800,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index f503e3b8e4..eb7f7568d9 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -35,7 +35,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -175,7 +175,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -323,7 +323,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -527,7 +527,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index c5812c066e..a8a93cf197 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -29,7 +29,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -78,7 +78,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -260,7 +260,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -347,7 +347,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -469,7 +469,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -518,7 +518,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -639,7 +639,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -716,7 +716,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -803,7 +803,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -932,7 +932,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1056,7 +1056,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -1101,7 +1101,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'item',
@@ -1267,7 +1267,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index d56a3475a1..bd96ce1255 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'itemize_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'itemize',
@@ -49,7 +49,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -160,7 +160,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -259,7 +259,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -355,7 +355,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -462,7 +462,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
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 9f92edff32..0f2773cda3 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -37,7 +37,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -139,7 +139,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index a9dee65e19..3703113e5a 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -29,7 +29,7 @@ $result_trees{'itemize_long_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -78,7 +78,7 @@ $result_trees{'itemize_long_item'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'itemize_long_item'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -276,7 +276,7 @@ $result_trees{'itemize_long_item'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -363,7 +363,7 @@ $result_trees{'itemize_long_item'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/itemize/not_closed_item.pl 
b/tp/t/results/itemize/not_closed_item.pl
index bee56df73a..b56385b2aa 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -32,7 +32,7 @@ $result_trees{'not_closed_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/itemize/not_closed_itemize.pl 
b/tp/t/results/itemize/not_closed_itemize.pl
index ec8a75e0d6..1581b488d0 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -32,7 +32,7 @@ $result_trees{'not_closed_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index a97bbed67e..075d5b35d0 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -32,7 +32,7 @@ $result_trees{'table_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -89,7 +89,7 @@ $result_trees{'table_in_itemize'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 9e175607af..2348129bd3 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -37,7 +37,7 @@ $result_trees{'w_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index b4caccf2e8..8b66fd67e9 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -72,7 +72,7 @@ $result_trees{'appendix_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'appendix_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'appendix_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index f7800ac072..8ed518bc24 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -72,7 +72,7 @@ $result_trees{'command_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -119,7 +119,7 @@ $result_trees{'command_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'command_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -229,7 +229,7 @@ $result_trees{'command_translated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index dd999ecf16..4b9cfe98f1 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -273,7 +273,7 @@ $result_trees{'documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -310,7 +310,7 @@ $result_trees{'documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -349,7 +349,7 @@ $result_trees{'documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -387,7 +387,7 @@ $result_trees{'documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/documentlanguage_generated_master_menu.pl 
b/tp/t/results/languages/documentlanguage_generated_master_menu.pl
index 790a587331..27259369ee 100644
--- a/tp/t/results/languages/documentlanguage_generated_master_menu.pl
+++ b/tp/t/results/languages/documentlanguage_generated_master_menu.pl
@@ -107,7 +107,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -143,7 +143,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -181,7 +181,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -219,7 +219,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -255,7 +255,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -331,7 +331,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -369,7 +369,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -405,7 +405,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -481,7 +481,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -517,7 +517,7 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 4bd3ce3488..c1d7a4b0ce 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -273,7 +273,7 @@ $result_trees{'documentlanguage_option'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -310,7 +310,7 @@ $result_trees{'documentlanguage_option'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -349,7 +349,7 @@ $result_trees{'documentlanguage_option'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -387,7 +387,7 @@ $result_trees{'documentlanguage_option'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index d4741e567c..cb8e479ae8 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -273,7 +273,7 @@ $result_trees{'documentlanguage_unknown'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -310,7 +310,7 @@ $result_trees{'documentlanguage_unknown'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -349,7 +349,7 @@ $result_trees{'documentlanguage_unknown'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -387,7 +387,7 @@ $result_trees{'documentlanguage_unknown'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index e9a52daf97..21440e9188 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -61,7 +61,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'defivar',
@@ -367,7 +367,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -403,7 +403,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -441,7 +441,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -478,7 +478,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index d74b1adcac..0024fb40c1 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -61,7 +61,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'defivar',
@@ -402,7 +402,7 @@ $result_trees{'multiple_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -438,7 +438,7 @@ $result_trees{'multiple_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -476,7 +476,7 @@ $result_trees{'multiple_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -512,7 +512,7 @@ $result_trees{'multiple_in_preamble'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 abcabdada3..b8939b0cc6 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -61,7 +61,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'defivar',
@@ -451,7 +451,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -487,7 +487,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -525,7 +525,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -561,7 +561,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index e3dd285221..5615df9257 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -84,7 +84,7 @@ $result_trees{'multiple_lang_chapters'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@documentlanguage ja
@@ -145,7 +145,7 @@ $result_trees{'multiple_lang_chapters'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -255,7 +255,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -291,7 +291,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -313,7 +313,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -646,7 +646,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -682,7 +682,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1006,7 +1006,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1042,7 +1042,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1366,7 +1366,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1402,7 +1402,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1690,7 +1690,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1726,7 +1726,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1796,7 +1796,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1832,7 +1832,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index cc89ad8e45..6efe0a8064 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -84,7 +84,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@documentlanguage ja
@@ -145,7 +145,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -255,7 +255,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -291,7 +291,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -313,7 +313,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -646,7 +646,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -682,7 +682,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1006,7 +1006,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1042,7 +1042,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1366,7 +1366,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1402,7 +1402,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1690,7 +1690,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1726,7 +1726,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1796,7 +1796,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1832,7 +1832,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 06327efb3b..7aa090cefa 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -84,7 +84,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@documentlanguage ja
@@ -145,7 +145,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@documentlanguage ja
@@ -222,7 +222,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -258,7 +258,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -280,7 +280,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -613,7 +613,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -649,7 +649,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -973,7 +973,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1009,7 +1009,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1333,7 +1333,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1369,7 +1369,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1657,7 +1657,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1693,7 +1693,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1763,7 +1763,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1799,7 +1799,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 6e88be978d..7f56534a59 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -72,7 +72,7 @@ $result_trees{'simple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'simple_documentlanguage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 572a5cbc8f..c443f52d7b 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -72,7 +72,7 @@ $result_trees{'unknown_language'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'unknown_language'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -146,7 +146,7 @@ $result_trees{'unknown_language'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -182,7 +182,7 @@ $result_trees{'unknown_language'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index c40b3c9644..411e05a336 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -72,7 +72,7 @@ $result_trees{'unknown_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -108,7 +108,7 @@ $result_trees{'unknown_region'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 57f992ba85..4986543913 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -75,7 +75,7 @@ $result_trees{'anchor_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -111,7 +111,7 @@ $result_trees{'anchor_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -149,7 +149,7 @@ $result_trees{'anchor_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -185,7 +185,7 @@ $result_trees{'anchor_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 2f2ee774f8..eb11ba3004 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -165,7 +165,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -203,7 +203,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -239,7 +239,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 8a44be2204..3aeea577a1 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
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -165,7 +165,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -203,7 +203,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -239,7 +239,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 0bcd778045..6a25261e38 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
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -118,7 +118,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -270,7 +270,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -306,7 +306,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -344,7 +344,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -380,7 +380,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 c02d2d6c5a..b728bbdd85 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
@@ -26,7 +26,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -118,7 +118,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -242,7 +242,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -278,7 +278,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -316,7 +316,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -352,7 +352,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 cc28117287..fd8d3b228a 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -35,7 +35,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -115,7 +115,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -151,7 +151,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -228,7 +228,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -308,7 +308,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -344,7 +344,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 47baba8bc7..f8b1d00584 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -74,7 +74,7 @@ $result_trees{'brace_in_index'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => '{'
diff --git a/tp/t/results/latex_tests/custom_heading_with_include.pl 
b/tp/t/results/latex_tests/custom_heading_with_include.pl
index 0b06bf1c99..4a02455ec5 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -125,7 +125,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -161,7 +161,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -218,7 +218,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -254,7 +254,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -357,7 +357,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@node Top
@@ -477,7 +477,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -514,7 +514,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -536,7 +536,7 @@ $result_trees{'custom_heading_with_include'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -661,7 +661,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -698,7 +698,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -720,7 +720,7 @@ $result_trees{'custom_heading_with_include'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -845,7 +845,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -882,7 +882,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -908,7 +908,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@menu
@@ -1014,7 +1014,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@contents
@@ -1164,7 +1164,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1205,7 +1205,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1246,7 +1246,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1272,7 +1272,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -1424,7 +1424,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1465,7 +1465,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1506,7 +1506,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1532,7 +1532,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection Include
@@ -1686,7 +1686,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1727,7 +1727,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1768,7 +1768,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1794,7 +1794,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -1959,7 +1959,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2000,7 +2000,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2041,7 +2041,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -2067,7 +2067,7 @@ $result_trees{'custom_heading_with_include'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -2176,7 +2176,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2212,7 +2212,7 @@ $result_trees{'custom_heading_with_include'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3a68c075ae..107eafa6bc 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
@@ -138,7 +138,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -174,7 +174,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -231,7 +231,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -267,7 +267,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -370,7 +370,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@node Top
@@ -490,7 +490,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -527,7 +527,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -549,7 +549,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -674,7 +674,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -711,7 +711,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -733,7 +733,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -858,7 +858,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -895,7 +895,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -921,7 +921,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@menu
@@ -1027,7 +1027,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@contents
@@ -1177,7 +1177,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1218,7 +1218,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1259,7 +1259,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1285,7 +1285,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -1437,7 +1437,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1478,7 +1478,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1519,7 +1519,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1545,7 +1545,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection Include
@@ -1699,7 +1699,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1740,7 +1740,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1781,7 +1781,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1807,7 +1807,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -1972,7 +1972,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2013,7 +2013,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2054,7 +2054,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -2080,7 +2080,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@subsubsection Subsubsection
@@ -2189,7 +2189,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2225,7 +2225,7 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 673ad7f3b4..4351b5f43a 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -191,7 +191,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -227,7 +227,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -265,7 +265,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -301,7 +301,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -399,7 +399,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -439,7 +439,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -575,7 +575,7 @@ $result_trees{'custom_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/custom_headings_and_comments.pl 
b/tp/t/results/latex_tests/custom_headings_and_comments.pl
index 25517f8906..6925537ca5 100644
--- a/tp/t/results/latex_tests/custom_headings_and_comments.pl
+++ b/tp/t/results/latex_tests/custom_headings_and_comments.pl
@@ -190,7 +190,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -226,7 +226,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -264,7 +264,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -300,7 +300,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -398,7 +398,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -438,7 +438,7 @@ $result_trees{'custom_headings_and_comments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/customize_informative_commands.pl 
b/tp/t/results/latex_tests/customize_informative_commands.pl
index 2cc2242354..afc846acc5 100644
--- a/tp/t/results/latex_tests/customize_informative_commands.pl
+++ b/tp/t/results/latex_tests/customize_informative_commands.pl
@@ -35,7 +35,7 @@ $result_trees{'customize_informative_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index a9343293b2..efad364425 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -32,7 +32,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -150,7 +150,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -268,7 +268,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -386,7 +386,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -504,7 +504,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -622,7 +622,7 @@ $result_trees{'enumerate_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 df42f42867..98767b6ebf 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -56,7 +56,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -169,7 +169,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -244,7 +244,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index 1483365c0d..3cafeee691 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -27,7 +27,7 @@ $result_trees{'example_in_cartouche'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -107,7 +107,7 @@ $result_trees{'example_in_cartouche'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -124,7 +124,7 @@ $result_trees{'example_in_cartouche'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index d7bf693eca..24a68d7aa2 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -35,7 +35,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -331,7 +331,7 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -484,7 +484,7 @@ $result_trees{'float_and_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -639,7 +639,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1513,7 +1513,7 @@ $result_trees{'float_and_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 6b50520789..e005516f41 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -74,7 +74,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -110,7 +110,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -148,7 +148,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -184,7 +184,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -224,7 +224,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -264,7 +264,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -345,7 +345,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -426,7 +426,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -507,7 +507,7 @@ $result_trees{'fonttextsize'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index d229f7d301..1686b16608 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -69,7 +69,7 @@ $result_trees{'indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -143,7 +143,7 @@ $result_trees{'indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -180,7 +180,7 @@ $result_trees{'indices'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 4f4351f353..2a70e67990 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -69,7 +69,7 @@ $result_trees{'indices_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'indices_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -143,7 +143,7 @@ $result_trees{'indices_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -180,7 +180,7 @@ $result_trees{'indices_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 8b156e7b31..f21b877d6c 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -35,7 +35,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -253,7 +253,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -289,7 +289,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 61a437fd24..4e0113510e 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -27,7 +27,7 @@ $result_trees{'nested_enumerate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -96,7 +96,7 @@ $result_trees{'nested_enumerate'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'nested_enumerate'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -234,7 +234,7 @@ $result_trees{'nested_enumerate'} = {
                                           'type' => 'block_line_arg'
                                         }
                                       ],
-                                      'type' => 'argument'
+                                      'type' => 'arguments_line'
                                     },
                                     {
                                       'contents' => [
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index 315ba19685..4ae5e9cce5 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -35,7 +35,7 @@ $result_trees{'nested_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -112,7 +112,7 @@ $result_trees{'nested_itemize'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -189,7 +189,7 @@ $result_trees{'nested_itemize'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -266,7 +266,7 @@ $result_trees{'nested_itemize'} = {
                                           'type' => 'block_line_arg'
                                         }
                                       ],
-                                      'type' => 'argument'
+                                      'type' => 'arguments_line'
                                     },
                                     {
                                       'contents' => [
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 0b357abf9c..f55ec3ccd5 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -35,7 +35,7 @@ $result_trees{'node_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'node_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -112,7 +112,7 @@ $result_trees{'node_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -150,7 +150,7 @@ $result_trees{'node_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -186,7 +186,7 @@ $result_trees{'node_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 9b9f952213..d78a162eb2 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -69,7 +69,7 @@ $result_trees{'pagesizes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'pagesizes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -143,7 +143,7 @@ $result_trees{'pagesizes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -179,7 +179,7 @@ $result_trees{'pagesizes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -251,7 +251,7 @@ $result_trees{'pagesizes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index efd4da3077..80896ac580 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -73,7 +73,7 @@ $result_trees{'pagetype'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'pagetype'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'pagetype'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -183,7 +183,7 @@ $result_trees{'pagetype'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -300,7 +300,7 @@ $result_trees{'pagetype'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index 2c1288a962..796064edb9 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -100,7 +100,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git 
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
index c24519d372..eef5b6c3fa 100644
--- 
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
+++ 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage_set_headings.pl
@@ -100,7 +100,7 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage_set_headings'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 0e58e8d0c6..8e0fe88900 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -112,7 +112,7 @@ $result_trees{'settitle_and_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index f6aaffb178..eeaac74861 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -75,7 +75,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -111,7 +111,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -149,7 +149,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -185,7 +185,7 @@ $result_trees{'shorttitlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index d291cf3ed0..417991e7b6 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_and_headings'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index 5abfb3eef6..c8ba395373 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -63,7 +63,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index 80f2021f4d..67d28cbe4d 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -63,7 +63,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 72b53758d5..aee94506e0 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_classical'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'titlepage_classical'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -362,7 +362,7 @@ $result_trees{'titlepage_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -398,7 +398,7 @@ $result_trees{'titlepage_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -436,7 +436,7 @@ $result_trees{'titlepage_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -472,7 +472,7 @@ $result_trees{'titlepage_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 6062af2931..abdc534ee0 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -35,7 +35,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -107,7 +107,7 @@ $result_trees{'titlepage_in_top_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'title',
@@ -207,7 +207,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -243,7 +243,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index af2e313aad..9ddf0f0ef3 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_long_title'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -132,7 +132,7 @@ $result_trees{'titlepage_long_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -168,7 +168,7 @@ $result_trees{'titlepage_long_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -206,7 +206,7 @@ $result_trees{'titlepage_long_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -242,7 +242,7 @@ $result_trees{'titlepage_long_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 8322290660..604556d382 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_no_author'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -121,7 +121,7 @@ $result_trees{'titlepage_no_author'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -157,7 +157,7 @@ $result_trees{'titlepage_no_author'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -195,7 +195,7 @@ $result_trees{'titlepage_no_author'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -231,7 +231,7 @@ $result_trees{'titlepage_no_author'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index da4ce5ecf3..412b81316b 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_no_title'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'titlefont',
@@ -150,7 +150,7 @@ $result_trees{'titlepage_no_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -186,7 +186,7 @@ $result_trees{'titlepage_no_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -224,7 +224,7 @@ $result_trees{'titlepage_no_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -260,7 +260,7 @@ $result_trees{'titlepage_no_title'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index dac0e12d34..da589c3c30 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -26,7 +26,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'title',
@@ -292,7 +292,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                           'type' => 'block_line_arg'
                                         }
                                       ],
-                                      'type' => 'argument'
+                                      'type' => 'arguments_line'
                                     },
                                     {
                                       'text' => '\\frac'
@@ -509,7 +509,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -545,7 +545,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -583,7 +583,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -619,7 +619,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index fa1da12e94..5ac6813481 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -35,7 +35,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -112,7 +112,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 65a59232d3..595dc3596c 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -27,7 +27,7 @@ $result_trees{'verbatim_in_smallformat'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'verbatim',
@@ -44,7 +44,7 @@ $result_trees{'verbatim_in_smallformat'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '... still verbatim, but in a smaller font ...
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 44c753f575..f58218ff77 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 28089f7552..1a17f26db5 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 8d656451c9..42999bd995 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index 92e24c2e59..7caae3684e 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index b4b68f1e9b..37c33f3b6a 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 046e50e88f..642a7e48fe 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 946cbaf6e1..a369155e8f 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index b327446b45..2fbd29a0a4 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 4456f4ba4b..002cdb2b69 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_node_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 2682a97e86..39079027af 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index d23bc44366..2392f8fa4b 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_node_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index eab91b95f1..e23b6b06d4 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_section'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 91e4b4f080..657e915f3d 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_section_no_header'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index ad0214b6ee..06e1c00bab 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index cc4d4535fc..d0fd3ffe27 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_section_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl 
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
index ec908750f0..d9a03b4ba7 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_test_undef_top_buttons.pl 
b/tp/t/results/layout/navigation_test_undef_top_buttons.pl
index f13157f903..76f372c6ca 100644
--- a/tp/t/results/layout/navigation_test_undef_top_buttons.pl
+++ b/tp/t/results/layout/navigation_test_undef_top_buttons.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_test_zero_top_buttons.pl 
b/tp/t/results/layout/navigation_test_zero_top_buttons.pl
index 6cf287dfa5..e1348333ee 100644
--- a/tp/t/results/layout/navigation_test_zero_top_buttons.pl
+++ b/tp/t/results/layout/navigation_test_zero_top_buttons.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index 6435a2115f..9d95341f5a 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -50,7 +50,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -291,7 +291,7 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -661,7 +661,7 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'navigation_vertical'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 2fd6af308b..fd16e47fb7 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -50,7 +50,7 @@ $result_trees{'no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -191,7 +191,7 @@ $result_trees{'no_monolithic'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -314,7 +314,7 @@ $result_trees{'no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -352,7 +352,7 @@ $result_trees{'no_monolithic'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 02d110cdc2..a3245c8351 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -50,7 +50,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -191,7 +191,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -314,7 +314,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -352,7 +352,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl 
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 6e8a336e62..33f5690a4f 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -20,7 +20,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline Parameter @var{\\param\\} @code{ : \\type\\}
@@ -80,7 +80,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline {Return Value} @var{\\param\\} @code{ : 
\\type\\}
@@ -140,7 +140,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline {Exception} \\exception\\
@@ -243,7 +243,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
@@ -553,7 +553,7 @@ $result_trees{'api_doc_with_linemacro'} = {
                           'status' => 'start'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
index bcdd4d687d..160deb24b2 100644
--- a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first: \\arg1\\|
diff --git a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
index fe0d95515b..a611ea4c41 100644
--- a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
@@ -20,7 +20,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'b \\a\\ a
@@ -133,7 +133,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'in ifset
@@ -256,7 +256,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl 
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index 568135853d..018803b1b0 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'b \\a\\ a
@@ -132,7 +132,7 @@ in quotation
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -221,7 +221,7 @@ in quotation
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -399,7 +399,7 @@ in quotation
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -520,7 +520,7 @@ ignored ',
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'source_marks' => [
@@ -636,7 +636,7 @@ args \\e\\|\\f\\|
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'args \\e\\|\\f\\|
@@ -731,7 +731,7 @@ args \\e\\|\\f\\|
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl 
b/tp/t/results/linemacro/blockitem_no_item.pl
index 33efdb89f5..a7a4234190 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -20,7 +20,7 @@ $result_trees{'blockitem_no_item'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
@@ -98,7 +98,7 @@ $result_trees{'blockitem_no_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl 
b/tp/t/results/linemacro/brace_command_not_closed.pl
index 28bcc11249..f1a5d546ba 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -20,7 +20,7 @@ $result_trees{'brace_command_not_closed'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
diff --git a/tp/t/results/linemacro/braces_after_text.pl 
b/tp/t/results/linemacro/braces_after_text.pl
index 8491372628..cc69a0b56f 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -20,7 +20,7 @@ $result_trees{'braces_after_text'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline \\a\\ \\b\\ \\c\\
@@ -143,7 +143,7 @@ $result_trees{'braces_after_text'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
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 4197da6c9e..39a4f4cbfd 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -20,7 +20,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@mymacro{@code{}
@@ -95,7 +95,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@table \\c\\
@@ -277,7 +277,7 @@ now second arg: gg '
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 5e80b8e19d..66f93e6f77 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@quotation \\a\\
@@ -90,7 +90,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@table \\c\\
@@ -217,7 +217,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
@@ -285,7 +285,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
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 374b7ad7a8..75abcf4300 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
@@ -20,7 +20,7 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'c \\a\\ d
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index 6d9b3547a9..d8bd7df204 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'comment_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'c \\a\\ d
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 6238fe29f9..2ce02f0b4e 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
@@ -20,7 +20,7 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'c \\a\\ d
diff --git 
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index b1b2892282..75fc445deb 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -20,7 +20,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first |\\a\\|
@@ -90,7 +90,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro \\a\\ text
diff --git a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
index 669940f904..cc10d8a7e4 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
@@ -20,7 +20,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first |\\a\\|
diff --git a/tp/t/results/linemacro/empty_last_argument.pl 
b/tp/t/results/linemacro/empty_last_argument.pl
index ba7d500f05..7fddabbdc7 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -52,7 +52,7 @@ $result_trees{'empty_last_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@BIindex \\symbol\\
@@ -166,7 +166,7 @@ $result_trees{'empty_last_argument'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index 4c4efae343..144ad71d29 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -20,7 +20,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\
@@ -92,7 +92,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -224,7 +224,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@lm {text
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl 
b/tp/t/results/linemacro/last_argument_with_braces.pl
index ce2b2357a7..d7494e6a16 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -20,7 +20,7 @@ $result_trees{'last_argument_with_braces'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline \\symbol\\ f r
@@ -134,7 +134,7 @@ $result_trees{'last_argument_with_braces'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/missing_formal_arg.pl 
b/tp/t/results/linemacro/missing_formal_arg.pl
index 9cd427b36f..134ef5a8ea 100644
--- a/tp/t/results/linemacro/missing_formal_arg.pl
+++ b/tp/t/results/linemacro/missing_formal_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'missing_formal_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\ and \\b\\.
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl 
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 945c2dee9f..cc56d7547e 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -20,7 +20,7 @@ $result_trees{'nested_linemacro_calls'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'inside {\\a\\ operator \\b\\}
@@ -85,7 +85,7 @@ $result_trees{'nested_linemacro_calls'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline \\one\\ {\\two\\} \\three\\
@@ -214,7 +214,7 @@ $result_trees{'nested_linemacro_calls'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
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 017b6d92f5..a6434df6b4 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -25,7 +25,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline category \\first\\ \\second\\ \\rest\\
@@ -150,7 +150,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/no_arguments.pl 
b/tp/t/results/linemacro/no_arguments.pl
index 1e468f72ad..c86317531b 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -20,7 +20,7 @@ $result_trees{'no_arguments'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Body.
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl 
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 8fb2ceb629..f446e168d5 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -20,7 +20,7 @@ $result_trees{'paragraph_no_paragraph'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl 
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 79f75d14a1..c657ffc8c3 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -20,7 +20,7 @@ $result_trees{'protected_spaces_on_line'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@deffn Function \\first\\ \\rest\\
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl 
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
index 2d8af7d974..bf37f5c029 100644
--- a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -20,7 +20,7 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\one\\bullet{}
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_body.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
index 92c04610f1..2f7d1da084 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
@@ -20,7 +20,7 @@ $result_trees{'recursive_linemacro_in_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@anorecurse {\\arg\\} d \\other\\
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_call.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
index a7113121bf..fcb3cafe43 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
@@ -20,7 +20,7 @@ $result_trees{'recursive_linemacro_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\arg\\ d \\other\\
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 21c1ded016..b7459c8d67 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -30,7 +30,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -48,7 +48,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'inside {\\a\\ operator \\b\\} \\rest\\
@@ -114,7 +114,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defline \\one\\ {\\two\\} \\three\\
@@ -243,7 +243,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
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 ca577617f0..f05c6ca8f2 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -20,7 +20,7 @@ $result_trees{'spaces_after_command_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defblock
@@ -153,7 +153,7 @@ $result_trees{'spaces_after_command_in_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
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 b80d540557..247e1d71f8 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
@@ -20,7 +20,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defblock
@@ -96,7 +96,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@samp{arg1}
@@ -160,7 +160,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '{\\name\\} \\rest\\
@@ -283,7 +283,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
@@ -546,7 +546,7 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
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 795cac30cb..93cf1d308d 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
@@ -20,7 +20,7 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defblock
@@ -154,7 +154,7 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/spaces_in_args.pl 
b/tp/t/results/linemacro/spaces_in_args.pl
index 603417ce35..7260b8161a 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -20,7 +20,7 @@ $result_trees{'spaces_in_args'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defblock
@@ -156,7 +156,7 @@ $result_trees{'spaces_in_args'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/spaces_in_call.pl 
b/tp/t/results/linemacro/spaces_in_call.pl
index 4ba1810f6d..a53df728da 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -20,7 +20,7 @@ $result_trees{'spaces_in_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@defblock
@@ -124,7 +124,7 @@ $result_trees{'spaces_in_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defline',
diff --git a/tp/t/results/linemacro/text_arguments.pl 
b/tp/t/results/linemacro/text_arguments.pl
index 2565b40bd3..4189553085 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -20,7 +20,7 @@ $result_trees{'text_arguments'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\three\\@bullet{}\\two\\@minus{}\\one\\
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index 18d7d89650..b485c8e854 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'verb_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first \\a\\
@@ -106,7 +106,7 @@ $result_trees{'verb_in_linemacro_call'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/linemacro/verb_not_closed.pl 
b/tp/t/results/linemacro/verb_not_closed.pl
index dbb5056035..6989ebb5ca 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -20,7 +20,7 @@ $result_trees{'verb_not_closed'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
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 dd6d0a2c98..85fc556f2f 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
@@ -20,7 +20,7 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
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 aacd97934a..a809ff43ed 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
@@ -20,7 +20,7 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\, \\b\\ \\c\\
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 3c0a21fdf4..562461a1e6 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -25,7 +25,7 @@ $result_trees{'arg_body_expansion_order'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'initial
@@ -87,7 +87,7 @@ $result_trees{'arg_body_expansion_order'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@unmacro othermacro
@@ -208,7 +208,7 @@ $result_trees{'arg_body_expansion_order'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'different
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index 2365c531b3..d3dc5e8813 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -20,7 +20,7 @@ $result_trees{'arg_not_closed'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'foo
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl 
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index 46e5b9dd8a..b80de633da 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first: \\arg1\\|
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index dcb4847216..80d09208ab 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -30,7 +30,7 @@ $result_trees{'backslash_in_arg'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'backslash_in_arg'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -84,7 +84,7 @@ $result_trees{'backslash_in_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@findex \\TEXT\\
diff --git a/tp/t/results/macro/bad_argument.pl 
b/tp/t/results/macro/bad_argument.pl
index b1f4e91b8c..7946642adc 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'bad_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in macro
@@ -81,7 +81,7 @@ $result_trees{'bad_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in
@@ -144,7 +144,7 @@ $result_trees{'bad_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in macro
@@ -209,7 +209,7 @@ $result_trees{'bad_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in #
diff --git a/tp/t/results/macro/bad_formal_arg.pl 
b/tp/t/results/macro/bad_formal_arg.pl
index 8cde694d3f..11511fb3f7 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -25,7 +25,7 @@ $result_trees{'bad_formal_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in bad macro
@@ -91,7 +91,7 @@ $result_trees{'bad_formal_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'bad space
@@ -157,7 +157,7 @@ $result_trees{'bad_formal_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in bar
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl 
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index d151678fcb..fc95809fc2 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -20,7 +20,7 @@ $result_trees{'bad_macro_name_with_underscore'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In macro
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 70d46def3e..6cafdc9c46 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -1749,7 +1749,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@set mybibrefnode \\node\\
@@ -1840,7 +1840,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@value{mybibrefnode}
@@ -1929,7 +1929,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@set mybibtable true
@@ -2040,7 +2040,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@set mybiblist true
@@ -2146,7 +2146,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@ifclear mybibrefnode
@@ -2247,7 +2247,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '(See item [\\ref\\] in @ref{\\node\\, \\ref\\}.)
@@ -2329,7 +2329,7 @@ $result_trees{'bib_example'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@ifclear mybiblist
@@ -2526,7 +2526,7 @@ $result_trees{'bib_example'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@clear mybibtable
@@ -2675,7 +2675,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2712,7 +2712,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2734,7 +2734,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2968,7 +2968,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3005,7 +3005,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3064,7 +3064,7 @@ $result_trees{'bib_example'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@mybibmakeref{mybibsetrefnode was not used, 
LaTeX2e}
@@ -3153,7 +3153,7 @@ $result_trees{'bib_example'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -3419,7 +3419,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3495,7 +3495,7 @@ $result_trees{'bib_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3531,7 +3531,7 @@ $result_trees{'bib_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3581,7 +3581,7 @@ $result_trees{'bib_example'} = {
                                 'type' => 'block_line_arg'
                               }
                             ],
-                            'type' => 'argument'
+                            'type' => 'arguments_line'
                           },
                           {
                             'text' => '@ifclear mybibtable
@@ -3667,7 +3667,7 @@ $result_trees{'bib_example'} = {
                                 'type' => 'block_line_arg'
                               }
                             ],
-                            'type' => 'argument'
+                            'type' => 'arguments_line'
                           }
                         ],
                         'info' => {
@@ -3801,7 +3801,7 @@ $result_trees{'bib_example'} = {
                                     'type' => 'block_line_arg'
                                   }
                                 ],
-                                'type' => 'argument'
+                                'type' => 'arguments_line'
                               },
                               {
                                 'text' => '@item @anchor{LaTeX2e}[LaTeX2e]
diff --git a/tp/t/results/macro/bye_in_macro.pl 
b/tp/t/results/macro/bye_in_macro.pl
index c72b2422b5..eb3d008ac1 100644
--- a/tp/t/results/macro/bye_in_macro.pl
+++ b/tp/t/results/macro/bye_in_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'bye_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Text
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 03a280eaf8..dc1ea363f5 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
@@ -20,7 +20,7 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '}
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index 734c45e159..9d436d4e83 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -20,7 +20,7 @@ $result_trees{'complete_macro_for_end'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end cartouche
@@ -104,7 +104,7 @@ $result_trees{'complete_macro_for_end'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 3d79eb34c0..08ffd2fc03 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'complex_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'coucou \\arg\\ after arg
@@ -84,7 +84,7 @@ $result_trees{'complex_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '1
@@ -161,7 +161,7 @@ $result_trees{'complex_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\text\\
@@ -455,7 +455,7 @@ macroseven defined
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@macrotwo
@@ -514,7 +514,7 @@ macroseven defined
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@macrofour
@@ -569,7 +569,7 @@ macroseven defined
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@emph{\\truc\\}
@@ -640,7 +640,7 @@ macroseven defined
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@macrofour
@@ -704,7 +704,7 @@ macroseven defined
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => '@macrotwo{aa,bb}
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl 
b/tp/t/results/macro/cpp_directives_after_macros.pl
index a7d0aea40f..523e2b6417 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -32,7 +32,7 @@ $result_trees{'cpp_directives_after_macros'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '  
@@ -96,7 +96,7 @@ $result_trees{'cpp_directives_after_macros'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl 
b/tp/t/results/macro/cpp_directives_in_macro.pl
index 4f2df51b34..5ef1290efd 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -32,7 +32,7 @@ $result_trees{'cpp_directives_in_macro'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '\\out\\
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 79aedbec4d..77096b46c3 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -32,7 +32,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '#line 30 "toto"
@@ -137,7 +137,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '#
@@ -239,7 +239,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\arg\\ "titi" 3\\arg\\
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl 
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index 79a5e5d188..75e9d893bb 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -59,7 +59,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '||\\arg\\||
diff --git a/tp/t/results/macro/double_macro_definition.pl 
b/tp/t/results/macro/double_macro_definition.pl
index e05654cacb..1a5abd628f 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -20,7 +20,7 @@ $result_trees{'double_macro_definition'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -77,7 +77,7 @@ $result_trees{'double_macro_definition'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index f9103c83d8..77cc0f80a3 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -25,7 +25,7 @@ $result_trees{'double_recursive_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@mactwo{}
@@ -89,7 +89,7 @@ $result_trees{'double_recursive_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@macone{}
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index 2a2caf9931..97a49f90fd 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -20,7 +20,7 @@ $result_trees{'empty_end'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in foo
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index 5bf10a2a5e..88adb9e9e0 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'empty_macro_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'text
@@ -209,7 +209,7 @@ $result_trees{'empty_macro_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'X\\arg\\X
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl 
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index 156c180acd..d43ba30980 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -115,7 +115,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl 
b/tp/t/results/macro/empty_macro_no_arg.pl
index 4218546b4b..dc0736a750 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'empty_macro_no_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 4574207452..fe36db2c03 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -20,7 +20,7 @@ $result_trees{'expand_two_same'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'With a doubles arg \\arg\\ and re \\arg\\
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index 5abffc090f..77aaa39d7e 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -20,7 +20,7 @@ $result_trees{'expansion_order'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@machin{}
@@ -84,7 +84,7 @@ $result_trees{'expansion_order'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\\\arg\\\\
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index fe720fd225..b0335d276c 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -20,7 +20,7 @@ $result_trees{'form_feeds'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'f \\a\\ n \\b\\
@@ -85,7 +85,7 @@ $result_trees{'form_feeds'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'g \\c\\ v
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 3061a48e3e..2f207ffda3 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -78,7 +78,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@table @asis
@@ -142,7 +142,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@glossarytext
@@ -216,7 +216,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@ifhtml
@@ -379,7 +379,7 @@ $result_trees{'glossary'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -416,7 +416,7 @@ $result_trees{'glossary'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -438,7 +438,7 @@ $result_trees{'glossary'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -598,7 +598,7 @@ $result_trees{'glossary'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -705,7 +705,7 @@ $result_trees{'glossary'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'name1 (@pxref{id1})
@@ -782,7 +782,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@unmacro glossarytext
@@ -909,7 +909,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@glossarytext{}
@@ -1051,7 +1051,7 @@ $result_trees{'glossary'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
@@ -1159,7 +1159,7 @@ $result_trees{'glossary'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       },
                       {
                         'text' => 'name2 (@pxref{id2})
@@ -1236,7 +1236,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@unmacro glossarytext
@@ -1363,7 +1363,7 @@ $result_trees{'glossary'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@glossarytext{}
@@ -1482,7 +1482,7 @@ $result_trees{'glossary'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1519,7 +1519,7 @@ $result_trees{'glossary'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index bca68bee95..c0f1583e7d 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'ifclear_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifclear notes 
@@ -131,7 +131,7 @@ $result_trees{'ifclear_in_macro'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 
b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
index bdcb339867..684d641bf7 100644
--- a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
+++ b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset a
@@ -82,7 +82,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end ifset
@@ -172,7 +172,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'in ifset
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index ed48e66877..9b03a2ad94 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'ifset_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset notes 
@@ -131,7 +131,7 @@ $result_trees{'ifset_in_macro'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'arg
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index 47277bb2f7..7933e01021 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -20,7 +20,7 @@ $result_trees{'ifset_in_macro_set'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset notes 
@@ -131,7 +131,7 @@ $result_trees{'ifset_in_macro_set'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index 7153ff35b7..4087250a65 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -20,7 +20,7 @@ $result_trees{'ignored_macro_definition'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'outside
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 5775d69bf2..789f1517e9 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -25,7 +25,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@strong{FIXAME: \\a\\}
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 13acbb4ede..c1aa33f8b5 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -20,7 +20,7 @@ $result_trees{'implicit_quoting_recursion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\\\b\\
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 2f05ca7f06..c6dea073a5 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'include_after_empty_line_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@code{\\body\\}
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 4c4cfa4662..6d0de8ea17 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -20,7 +20,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  Some  here
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index a685cb521c..a425e9b9a9 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -20,7 +20,7 @@ $result_trees{'line_after_recursive_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ggg
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl 
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 2377f536a3..b6dd3fcdef 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@center A @ringaccent 
@@ -167,7 +167,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@center B @ringaccent
diff --git a/tp/t/results/macro/macro_after_paragraph.pl 
b/tp/t/results/macro/macro_after_paragraph.pl
index c114c6e3a8..4ff9be7446 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_after_paragraph'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 7aca790af5..1aa8404a11 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -30,7 +30,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -141,7 +141,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -159,7 +159,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '||\\arg\\||
@@ -544,7 +544,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
@@ -722,7 +722,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '!!\\arg\\!!
@@ -1104,7 +1104,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '%%\\arg\\%%
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl 
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index 09009f48d0..f82ae10913 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => ' cp fn
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl 
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index ccc96a6328..8427dde0b9 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first \\aa\\,
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl 
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index f33073b007..ef02a7e4a3 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first \\aa\\,
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 29e7e443d7..e1a666370c 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'before comma, after
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 47eb4acde8..a331556568 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ex, before, after
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 63312e7c8e..6935c105b9 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(
@@ -82,7 +82,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(begin
@@ -144,7 +144,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'last
@@ -206,7 +206,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'last)
@@ -268,7 +268,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'last)   
@@ -330,7 +330,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'last)  mynode
@@ -396,7 +396,7 @@ $result_trees{'macro_call_in_node_manual'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 761175a492..a15111dc74 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
@@ -20,7 +20,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Para @inlinefmt{tex, inT
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 b0af8d38e8..b2e6bea795 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
@@ -20,7 +20,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Toto @inlinefmtifelse{tex, before
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 f1f63e9eec..2a54d00f13 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
@@ -20,7 +20,7 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'own, ignored
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 d1f2586478..b65ca38652 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
@@ -20,7 +20,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Para @inlineraw{tex, in@something
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index bbd81f95d5..31dce5ad09 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@tex
@@ -110,7 +110,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index 1734aa01a7..695cbcc86a 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_expands_to_empty'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\arg\\
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 472ab9ce94..ba4f511dac 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -25,7 +25,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result of a macro with \\arg1\\ and 
@@ -158,7 +158,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'second arg
@@ -283,7 +283,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -378,7 +378,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -496,7 +496,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@macroone{nested second arg}
@@ -614,7 +614,7 @@ $result_trees{'macro_expansion'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '{} \\ 
@@ -750,7 +750,7 @@ now'
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'arg3
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 2d033a5b41..d966080a03 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset flag
@@ -139,7 +139,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index f5e34623ba..592a19d891 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset fl
@@ -137,7 +137,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index 8403d89cc5..ef86519b61 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_expansion_end_in_ignored_ifset_content'} 
= {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset a
@@ -112,7 +112,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_ifset_content'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'source_marks' => [
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index 4589749303..76184f9ef8 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -20,7 +20,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset a
@@ -117,7 +117,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifset b
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index bda55c928d..7379a9f90b 100644
--- 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++ 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -20,7 +20,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@ifset a
@@ -117,7 +117,7 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@ifclear b
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 664b901463..5815892b0a 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ab
@@ -82,7 +82,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'c\\arg\\d}
@@ -395,7 +395,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl 
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index a03b136129..9a614c78ad 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '.
@@ -86,7 +86,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index 26f5a8975e..a7b96659f4 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_for_end'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end
@@ -104,7 +104,7 @@ $result_trees{'macro_for_end'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl 
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index 014645c714..8a839c7aba 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@page
diff --git a/tp/t/results/macro/macro_for_verb.pl 
b/tp/t/results/macro/macro_for_verb.pl
index 6ebe920e96..2e6b1fa2ff 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_for_verb'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@verb{
diff --git a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl 
b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
index be2dcaab0d..f4e591ccdc 100644
--- a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
+++ b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_imbricated_with_beginning_command_name'} 
= {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index f8aaef665b..770d092600 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a
@@ -82,7 +82,7 @@ $result_trees{'macro_in_accent'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 14186aa091..931756abc8 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_brace_command'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'foo-expansion
@@ -82,7 +82,7 @@ $result_trees{'macro_in_brace_command'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'bar-expansion
@@ -156,7 +156,7 @@ $result_trees{'macro_in_brace_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 8622baf26f..9a232656ac 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_def_delimiters'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'aa(b *c)
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl 
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 93eed0d936..1c91834b77 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -86,7 +86,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index 6c6b194a6c..9643d317f4 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_empty_multitable_empty_before_item'} 
= {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -111,7 +111,7 @@ 
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index c028066223..dc99fc3cb7 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -89,7 +89,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
diff --git a/tp/t/results/macro/macro_in_empty_text.pl 
b/tp/t/results/macro/macro_in_empty_text.pl
index 3e90b5f4cb..a3c3b92f07 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_empty_text'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -109,7 +109,7 @@ $result_trees{'macro_in_empty_text'} = {
                   'status' => 'end'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index 5212377198..3daa71274e 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_end_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'cartouche
@@ -86,7 +86,7 @@ $result_trees{'macro_in_end_argument'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/macro_in_ifset.pl 
b/tp/t/results/macro/macro_in_ifset.pl
index 05efd63427..c9af52daa5 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_ifset'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end ifset
@@ -92,7 +92,7 @@ $result_trees{'macro_in_ifset'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@macroone
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index b13fe52356..a079b4ecd4 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@end ifset
@@ -92,7 +92,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@macroone{
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 3cbb0e6157..3708383737 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'cp
@@ -77,7 +77,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'fn
@@ -134,7 +134,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@syncodeindex
@@ -343,7 +343,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'truc
@@ -482,7 +482,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@trucindex
@@ -544,7 +544,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'codeidx
@@ -670,7 +670,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a @var{index entry} t@\'e @^{@dotless{i}}
@@ -744,7 +744,7 @@ $result_trees{'macro_in_index_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -780,7 +780,7 @@ $result_trees{'macro_in_index_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index b8f199db16..14a4884789 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'badm
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index 27ecbe5c3b..a10bc7311b 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -25,7 +25,7 @@ $result_trees{'macro_in_macro_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a, @macrotwo
@@ -87,7 +87,7 @@ $result_trees{'macro_in_macro_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'hello \\arg\\ after arg
@@ -151,7 +151,7 @@ $result_trees{'macro_in_macro_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\text\\
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl 
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index 7829f1b1b2..df4fb4849e 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a, macro2
@@ -82,7 +82,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\text\\
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 365fd7c784..26695810b9 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -25,7 +25,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '*
@@ -87,7 +87,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '* 
@@ -149,7 +149,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  
@@ -211,7 +211,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => ' 
@@ -273,7 +273,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '::
@@ -335,7 +335,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => ':
@@ -401,7 +401,7 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl 
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index 3ee5c33e3b..4d801b655c 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = 
{
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -86,7 +86,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
@@ -129,7 +129,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} 
= {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
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 4c85dc79af..6795511f73 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
@@ -25,7 +25,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -91,7 +91,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_menu_description.pl 
b/tp/t/results/macro/macro_in_menu_description.pl
index 57d35d6b76..3b086ff628 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_menu_description'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -86,7 +86,7 @@ $result_trees{'macro_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index b4d124a242..1a34427da5 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'atext
@@ -82,7 +82,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Top
@@ -164,7 +164,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -244,7 +244,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'subheading',
@@ -348,7 +348,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'en
@@ -405,7 +405,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@documentlanguage
@@ -612,7 +612,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '200mm,150mm
@@ -674,7 +674,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@afourpaper
@@ -989,7 +989,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '0.1
@@ -1115,7 +1115,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@raisesections
@@ -1205,7 +1205,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@lowersections
@@ -1388,7 +1388,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'phi
@@ -1549,7 +1549,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@strong
@@ -1606,7 +1606,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'strong
@@ -1917,7 +1917,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'code
@@ -2075,7 +2075,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2156,7 +2156,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'asis
@@ -2213,7 +2213,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '0
@@ -2270,7 +2270,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'none
@@ -2327,7 +2327,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '4
@@ -2384,7 +2384,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '6
@@ -2805,7 +2805,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'end
@@ -2862,7 +2862,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'separate 
@@ -3042,7 +3042,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'on
@@ -3099,7 +3099,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'off
@@ -3289,7 +3289,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '10
@@ -3415,7 +3415,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'false
@@ -3472,7 +3472,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'true
@@ -3657,7 +3657,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@page
@@ -3714,7 +3714,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@noindent
@@ -3771,7 +3771,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@refill
@@ -4332,7 +4332,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@contents
@@ -4447,7 +4447,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@exdent
@@ -4562,7 +4562,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '2
@@ -4683,7 +4683,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@result
@@ -4771,7 +4771,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4940,7 +4940,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4976,7 +4976,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -5039,7 +5039,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@shortcontents
@@ -5139,7 +5139,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@bye
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index 4eb937df3a..a1ce19b4af 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -111,7 +111,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index 258dc47461..a17dab8f6a 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -89,7 +89,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 ea41671fd1..ea278ab891 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
@@ -20,7 +20,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ag,
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 3f723c47e5..f525256a45 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
@@ -20,7 +20,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'ag,
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index 277db13453..6be9f3f0fa 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_name_with_digit'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'macro1
@@ -82,7 +82,7 @@ $result_trees{'macro_name_with_digit'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'expand \\arg\\
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 3e11366ce3..1082e6c915 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_name_with_hyphen'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'This \\arg-one\\ and that \\arg2\\.
diff --git a/tp/t/results/macro/macro_name_zero.pl 
b/tp/t/results/macro/macro_name_zero.pl
index 4274727457..fb9a71e494 100644
--- a/tp/t/results/macro/macro_name_zero.pl
+++ b/tp/t/results/macro/macro_name_zero.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_name_zero'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in macro
diff --git a/tp/t/results/macro/macro_no_arg_bad_expansion.pl 
b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
index 8e5396a300..84f7885e65 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'res1
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 512a091ff9..cfdb56bce8 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_no_arg_expansion'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'res1
diff --git a/tp/t/results/macro/macro_no_argument.pl 
b/tp/t/results/macro/macro_no_argument.pl
index 9708a425c8..9ffd98e130 100644
--- a/tp/t/results/macro/macro_no_argument.pl
+++ b/tp/t/results/macro/macro_no_argument.pl
@@ -19,7 +19,7 @@ $result_trees{'macro_no_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
diff --git a/tp/t/results/macro/macro_not_closed.pl 
b/tp/t/results/macro/macro_not_closed.pl
index c07ce9bcf9..8f48f33b95 100644
--- a/tp/t/results/macro/macro_not_closed.pl
+++ b/tp/t/results/macro/macro_not_closed.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_not_closed'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in macro
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl 
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index b4bd6e6469..429b745ab9 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Arg \\arg\\.
diff --git a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl 
b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
index a70c1de3e9..a5831d6a32 100644
--- a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
+++ b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '||\\arg\\||
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl 
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index 0b35471c16..221c13509e 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@center
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 1544b5ba1a..aa501ac9fc 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_zero'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '0
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index 99a7093852..93e669adc1 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -20,7 +20,7 @@ $result_trees{'nested_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(machin)
@@ -82,7 +82,7 @@ $result_trees{'nested_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@machin{}
diff --git a/tp/t/results/macro/no_macrobody.pl 
b/tp/t/results/macro/no_macrobody.pl
index ea4eb64fbf..2c058c4158 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -20,7 +20,7 @@ $result_trees{'no_macrobody'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/macro/non_ascii_in_macro_name.pl 
b/tp/t/results/macro/non_ascii_in_macro_name.pl
index 456ac8413e..bfb3bf98e2 100644
--- a/tp/t/results/macro/non_ascii_in_macro_name.pl
+++ b/tp/t/results/macro/non_ascii_in_macro_name.pl
@@ -20,7 +20,7 @@ $result_trees{'non_ascii_in_macro_name'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(@`{\\a\\})
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index 92a472aa73..91a21199a5 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'paragraph_and_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -77,7 +77,7 @@ $result_trees{'paragraph_and_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '   
@@ -139,7 +139,7 @@ $result_trees{'paragraph_and_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a word
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index dfd699e1e1..25240dce10 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_comma_macro_line'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'we get \\arg\\ and another \\arg\\
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index 0805114a99..e973410f00 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_in_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
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 0a3c6f4b8b..e556412c66 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_in_body_line_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
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 93f48b70cd..f43805aa1d 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_in_body_one_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index d3b846fd9a..c79166ad7d 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'recursive_call_in_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index 3d7758f9a2..5898be2992 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'recursive_call_in_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@anorecurse{arg}
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl 
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 289d8cb037..fcaf67c1ec 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -25,7 +25,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@rec{}
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 957ce885bb..d5483de328 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'redefine_texinfo_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@emph{\\arg\\}
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index 88d09bcba1..cacb8f63c5 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -20,7 +20,7 @@ $result_trees{'simple_imbricated_macro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'truc.
@@ -121,7 +121,7 @@ $result_trees{'simple_imbricated_macro'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'bidule.
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl 
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index 1ef50791f6..d26e2c456a 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -20,7 +20,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'truc.
@@ -121,7 +121,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'bidule.
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index 9051f93f6f..da6c471759 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -20,7 +20,7 @@ $result_trees{'space_macro_after_end'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  
@@ -86,7 +86,7 @@ $result_trees{'space_macro_after_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl 
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 8e135c2c0c..2ab835521e 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -20,7 +20,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -86,7 +86,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim
diff --git a/tp/t/results/macro/text_before_after.pl 
b/tp/t/results/macro/text_before_after.pl
index d5740c9a39..0de304efe9 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -25,7 +25,7 @@ $result_trees{'text_before_after'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'in macro
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index 557a78a7c2..98c06accab 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -20,7 +20,7 @@ $result_trees{'too_much_args'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first arg: \\first\\
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl 
b/tp/t/results/macro/two_macros_on_a_line.pl
index 345e79b4ce..2c88d8cd0c 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -20,7 +20,7 @@ $result_trees{'two_macros_on_a_line'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in mymacro
@@ -82,7 +82,7 @@ $result_trees{'two_macros_on_a_line'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in with args
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl 
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index de9de61aee..d9c087bb16 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -20,7 +20,7 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In macro \\not arg
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 60e84b694c..44d7f4e0b0 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
@@ -20,7 +20,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'first: \\a\\
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 bc84259ed5..0ed4cde571 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
@@ -25,7 +25,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\a\\|\\b\\|\\c\\
diff --git a/tp/t/results/macro/zero_argument.pl 
b/tp/t/results/macro/zero_argument.pl
index 79db1709dc..393adaa55d 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -20,7 +20,7 @@ $result_trees{'zero_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in foo
@@ -82,7 +82,7 @@ $result_trees{'zero_argument'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in bar
diff --git a/tp/t/results/macro/zero_argument_comment.pl 
b/tp/t/results/macro/zero_argument_comment.pl
index 47fc39154c..b54b4669b7 100644
--- a/tp/t/results/macro/zero_argument_comment.pl
+++ b/tp/t/results/macro/zero_argument_comment.pl
@@ -20,7 +20,7 @@ $result_trees{'zero_argument_comment'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in foo
@@ -82,7 +82,7 @@ $result_trees{'zero_argument_comment'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in bar
diff --git 
a/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl 
b/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
index 73dcecfc0b..5da26d68a1 100644
--- a/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
+++ b/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
@@ -30,7 +30,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -180,7 +180,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -216,7 +216,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -256,7 +256,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -294,7 +294,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -330,7 +330,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -371,7 +371,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -409,7 +409,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -445,7 +445,7 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index 9039dd7a89..ae71398b16 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -24,7 +24,7 @@ $result_trees{'bad_beginning'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 29f4e5be02..bb9e7e5749 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -30,7 +30,7 @@ $result_trees{'block_commands_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'block_commands_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -155,7 +155,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -262,7 +262,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -400,7 +400,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -474,7 +474,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'text' => '
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index f179c7d8fb..9f0e2dec2b 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -30,7 +30,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -318,7 +318,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -338,7 +338,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'anchor',
@@ -523,7 +523,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'image',
@@ -630,7 +630,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                           'type' => 'line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'text' => '
@@ -750,7 +750,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -787,7 +787,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -884,7 +884,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 298f6e560e..4a87afc63c 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -30,7 +30,7 @@ $result_trees{'comment_on_menu_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -58,7 +58,7 @@ $result_trees{'comment_on_menu_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -185,7 +185,7 @@ $result_trees{'comment_on_menu_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -220,7 +220,7 @@ $result_trees{'comment_on_menu_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index 6f8ac8fcfb..f3b79c4a6b 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -29,7 +29,7 @@ $result_trees{'dash_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index ecd33ce35c..9575bdd601 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -29,7 +29,7 @@ $result_trees{'detailmenu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -107,7 +107,7 @@ $result_trees{'detailmenu'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index c66d01ca4e..a5ad82d54c 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -29,7 +29,7 @@ $result_trees{'detailmenu_in_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'detailmenu_in_description'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index e601a4cf25..389a1080d6 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -30,7 +30,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -212,7 +212,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -326,7 +326,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -546,7 +546,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -582,7 +582,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -604,7 +604,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -725,7 +725,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -761,7 +761,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -801,7 +801,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -837,7 +837,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -859,7 +859,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1026,7 +1026,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1062,7 +1062,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1102,7 +1102,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1138,7 +1138,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 5c6eca1694..c4073c3c75 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -30,7 +30,7 @@ $result_trees{'detailmenu_unknown_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'detailmenu',
@@ -69,7 +69,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index c64bc972f3..c9611bc6e8 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -30,7 +30,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -115,7 +115,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/empty_leading_menu_comment.pl 
b/tp/t/results/menu/empty_leading_menu_comment.pl
index 868e1f2591..a0b26d71ef 100644
--- a/tp/t/results/menu/empty_leading_menu_comment.pl
+++ b/tp/t/results/menu/empty_leading_menu_comment.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_leading_menu_comment'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'empty_leading_menu_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index 25e545d10b..2ff3e6703d 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'empty_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index 9d0f4b4a60..923e3c8a11 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_menu_entry_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'empty_menu_entry_name'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -239,7 +239,7 @@ $result_trees{'empty_menu_entry_name'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index cf1435e880..b0bf4fb888 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -30,7 +30,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'entry_after_detailmenu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'detailmenu',
@@ -69,7 +69,7 @@ $result_trees{'entry_after_detailmenu'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -253,7 +253,7 @@ $result_trees{'entry_after_detailmenu'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -457,7 +457,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -493,7 +493,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index f215ccca92..5b0707c8da 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'example_in_menu_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'example_in_menu_comment'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index b66581c39f..68c8b62714 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -30,7 +30,7 @@ $result_trees{'example_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'example_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'example_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -147,7 +147,7 @@ $result_trees{'example_in_menu_description'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/menu/format_menu_undef.pl 
b/tp/t/results/menu/format_menu_undef.pl
index 5fb1cab1e0..42b1362d1c 100644
--- a/tp/t/results/menu/format_menu_undef.pl
+++ b/tp/t/results/menu/format_menu_undef.pl
@@ -30,7 +30,7 @@ $result_trees{'format_menu_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'format_menu_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'format_menu_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'format_menu_undef'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 65052b85f3..79975d3858 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'formats_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'formats_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -119,7 +119,7 @@ $result_trees{'formats_in_menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -296,7 +296,7 @@ $result_trees{'formats_in_menu'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'text' => 'some @ verb{x atim
@@ -406,7 +406,7 @@ $result_trees{'formats_in_menu'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -571,7 +571,7 @@ $result_trees{'formats_in_menu'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 6fd14fd13d..c723df873f 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -30,7 +30,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 15b84bbf49..1308206399 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -30,7 +30,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/leading_space_before_menu_star.pl 
b/tp/t/results/menu/leading_space_before_menu_star.pl
index cc84d91e97..cdb27863eb 100644
--- a/tp/t/results/menu/leading_space_before_menu_star.pl
+++ b/tp/t/results/menu/leading_space_before_menu_star.pl
@@ -30,7 +30,7 @@ $result_trees{'leading_space_before_menu_star'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'leading_space_before_menu_star'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index 238a4a5266..7878be4367 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index 4553a3e25c..0296e5392f 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index 7aecf0c7fa..6980546d24 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_no_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_no_entry_location.pl 
b/tp/t/results/menu/menu_entry_no_entry_location.pl
index 7d6338c6a4..551ed02241 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index e8aad2450a..c019ad34ca 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index e91cc3107f..1fcd275aee 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_entry_node_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 18050a8e2d..a3704cb5ef 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_in_deffn'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -145,7 +145,7 @@ $result_trees{'menu_in_deffn'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index c537c51911..4bb41b2eb5 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_in_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'menu_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'menu',
@@ -69,7 +69,7 @@ $result_trees{'menu_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -128,7 +128,7 @@ $result_trees{'menu_in_example'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -210,7 +210,7 @@ $result_trees{'menu_in_example'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/menu/menu_no_closed_after_empty_line.pl 
b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
index 64dd8e4e58..8d41ffc993 100644
--- a/tp/t/results/menu/menu_no_closed_after_empty_line.pl
+++ b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_no_closed_entry_beginning.pl 
b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
index b7f76118e3..220be0dd0e 100644
--- a/tp/t/results/menu/menu_no_closed_entry_beginning.pl
+++ b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_no_closed_entry_beginning'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_no_closed_in_description.pl 
b/tp/t/results/menu/menu_no_closed_in_description.pl
index a5f68eaca9..74bc98c137 100644
--- a/tp/t/results/menu/menu_no_closed_in_description.pl
+++ b/tp/t/results/menu/menu_no_closed_in_description.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_no_closed_in_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_no_closed_in_entry.pl 
b/tp/t/results/menu/menu_no_closed_in_entry.pl
index c7ed6b6355..95ebaab38a 100644
--- a/tp/t/results/menu/menu_no_closed_in_entry.pl
+++ b/tp/t/results/menu/menu_no_closed_in_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_no_closed_in_entry'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_no_closed_star.pl 
b/tp/t/results/menu/menu_no_closed_star.pl
index 46d435fc2a..0ec85c3fbe 100644
--- a/tp/t/results/menu/menu_no_closed_star.pl
+++ b/tp/t/results/menu/menu_no_closed_star.pl
@@ -24,7 +24,7 @@ $result_trees{'menu_no_closed_star'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index e4fcf844cb..79598b0142 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_node_unterminated'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'menu_node_unterminated'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 4924635425..9e65a0b918 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -132,7 +132,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 9549eba813..b5f0ebc94c 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -30,7 +30,7 @@ $result_trees{'menu_title_before_entries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'menu_title_before_entries'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -188,7 +188,7 @@ $result_trees{'menu_title_before_entries'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index 87ac593426..b9950c36fb 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -30,7 +30,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -430,7 +430,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -466,7 +466,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -488,7 +488,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -609,7 +609,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -645,7 +645,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -685,7 +685,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -721,7 +721,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -743,7 +743,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -910,7 +910,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -946,7 +946,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -986,7 +986,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1022,7 +1022,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index b628c99390..a0be776087 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -30,7 +30,7 @@ $result_trees{'multiple_menus'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'multiple_menus'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -169,7 +169,7 @@ $result_trees{'multiple_menus'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index bca36a8150..4e747c0251 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'no_colon_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'no_colon_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/nodedescription_descriptions.pl 
b/tp/t/results/menu/nodedescription_descriptions.pl
index d11777f580..f8fced968f 100644
--- a/tp/t/results/menu/nodedescription_descriptions.pl
+++ b/tp/t/results/menu/nodedescription_descriptions.pl
@@ -30,7 +30,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'nodedescription_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -522,7 +522,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -670,7 +670,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -716,7 +716,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -782,7 +782,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -828,7 +828,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -894,7 +894,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -940,7 +940,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1006,7 +1006,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1052,7 +1052,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1118,7 +1118,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1164,7 +1164,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1230,7 +1230,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1276,7 +1276,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1342,7 +1342,7 @@ $result_trees{'nodedescription_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/menu/nodedescriptionblock_descriptions.pl 
b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
index 1142151490..5631829a51 100644
--- a/tp/t/results/menu/nodedescriptionblock_descriptions.pl
+++ b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
@@ -30,7 +30,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -418,7 +418,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -550,7 +550,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -630,7 +630,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -682,7 +682,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -702,7 +702,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -783,7 +783,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -829,7 +829,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -849,7 +849,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -894,7 +894,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1010,7 +1010,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1056,7 +1056,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1106,7 +1106,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1186,7 +1186,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1238,7 +1238,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1258,7 +1258,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1339,7 +1339,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1367,7 +1367,7 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/part_appendix_in_generated_menu.pl 
b/tp/t/results/menu/part_appendix_in_generated_menu.pl
index 183c8736d6..4ca35edde9 100644
--- a/tp/t/results/menu/part_appendix_in_generated_menu.pl
+++ b/tp/t/results/menu/part_appendix_in_generated_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -185,7 +185,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -261,7 +261,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -299,7 +299,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -335,7 +335,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -376,7 +376,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -412,7 +412,7 @@ $result_trees{'part_appendix_in_generated_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 2a35d2b9c3..92076ec9a7 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -37,7 +37,7 @@ $result_trees{'reference_to_external_manual'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -59,7 +59,7 @@ $result_trees{'reference_to_external_manual'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 6852d30a6a..3e04fa3a9d 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -37,7 +37,7 @@ $result_trees{'sc_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -59,7 +59,7 @@ $result_trees{'sc_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -213,7 +213,7 @@ $result_trees{'sc_in_menu'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -431,7 +431,7 @@ $result_trees{'sc_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -453,7 +453,7 @@ $result_trees{'sc_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'menu',
@@ -470,7 +470,7 @@ $result_trees{'sc_in_menu'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index c1a1e101e7..7fd64d5004 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -43,7 +43,7 @@ $result_trees{'simple'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 6bce8bfc0d..3ff8054fe4 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -43,7 +43,7 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/menu/space_and_commands_in_menu_node.pl 
b/tp/t/results/menu/space_and_commands_in_menu_node.pl
index c8eb651170..99744e7c41 100644
--- a/tp/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tp/t/results/menu/space_and_commands_in_menu_node.pl
@@ -30,7 +30,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -673,7 +673,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -709,7 +709,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 013cc64bed..9cf3c86915 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -30,7 +30,7 @@ $result_trees{'submenu_in_example'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'submenu_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'submenu_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'submenu_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'end',
@@ -191,7 +191,7 @@ $result_trees{'submenu_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -272,7 +272,7 @@ $result_trees{'submenu_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'submenu_in_example'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
@@ -440,7 +440,7 @@ $result_trees{'submenu_in_example'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'cmdname' => 'item',
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 4cf08567d7..8907dbeba6 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -30,7 +30,7 @@ $result_trees{'verb_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'verb_in_menu_description'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'verb_in_menu_description'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index b404efdac5..f022dd0f3b 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -22,7 +22,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '``simple-double--three---four----\'\' `simple\' 
quotedblleft: @quotedblleft{} @*
@@ -109,7 +109,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '@quotes{}
@@ -255,7 +255,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -558,7 +558,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -939,7 +939,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -1383,7 +1383,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1479,7 +1479,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1515,7 +1515,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1553,7 +1553,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1589,7 +1589,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1897,7 +1897,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2278,7 +2278,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2692,7 +2692,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2995,7 +2995,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -3376,7 +3376,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index e9b9febcb8..ee5dcd6b9c 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -82,7 +82,7 @@ $result_trees{'comment_space_command_on_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -130,7 +130,7 @@ $result_trees{'comment_space_command_on_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -177,7 +177,7 @@ $result_trees{'comment_space_command_on_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -226,7 +226,7 @@ $result_trees{'comment_space_command_on_line'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -497,7 +497,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/misc_commands/double_exdent.pl 
b/tp/t/results/misc_commands/double_exdent.pl
index 0b7a3b3c89..18f647fe19 100644
--- a/tp/t/results/misc_commands/double_exdent.pl
+++ b/tp/t/results/misc_commands/double_exdent.pl
@@ -24,7 +24,7 @@ $result_trees{'double_exdent'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'double_exdent'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 1b7e436bbf..b866b6a0c9 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -55,7 +55,7 @@ $result_trees{'footnote_in_center'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'cmdname' => 'table',
@@ -80,7 +80,7 @@ $result_trees{'footnote_in_center'} = {
                                       'type' => 'block_line_arg'
                                     }
                                   ],
-                                  'type' => 'argument'
+                                  'type' => 'arguments_line'
                                 },
                                 {
                                   'contents' => [
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 20bef973b0..bc6bbdcb63 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -87,7 +87,7 @@ $result_trees{'heading_command_in_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -176,7 +176,7 @@ $result_trees{'heading_command_in_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'everyheading',
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 4c267af56f..e02db5b381 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -24,7 +24,7 @@ $result_trees{'indent_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'indent',
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 33e3f290e3..dac78290f5 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -20,7 +20,7 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@code{in code out of example @code{in nested code}}.
@@ -394,7 +394,7 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -883,7 +883,7 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1354,7 +1354,7 @@ $result_trees{'kbdinputstyle'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index c384a28472..3774256313 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -20,7 +20,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@table @kbd
@@ -251,7 +251,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -374,7 +374,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -489,7 +489,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'table',
@@ -518,7 +518,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -636,7 +636,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -872,7 +872,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -995,7 +995,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1110,7 +1110,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'table',
@@ -1136,7 +1136,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1250,7 +1250,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1482,7 +1482,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1601,7 +1601,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1715,7 +1715,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'table',
@@ -1741,7 +1741,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1855,7 +1855,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 6e3122ea8e..86f78f5738 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -30,7 +30,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'subheading',
@@ -91,7 +91,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/misc_commands/nodedescription.pl 
b/tp/t/results/misc_commands/nodedescription.pl
index 81df0d2559..3f8e6a4633 100644
--- a/tp/t/results/misc_commands/nodedescription.pl
+++ b/tp/t/results/misc_commands/nodedescription.pl
@@ -64,7 +64,7 @@ $result_trees{'nodedescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -100,7 +100,7 @@ $result_trees{'nodedescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -138,7 +138,7 @@ $result_trees{'nodedescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -220,7 +220,7 @@ $result_trees{'nodedescription'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index f4564ad56f..1c78ffe55c 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -33,7 +33,7 @@ $result_trees{'noindent_after_smallexample'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index ae7c0b69cb..faf105a7d1 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -35,7 +35,7 @@ $result_trees{'ref_in_center'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'ref_in_center'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'ref_in_center'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'ref_in_center'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/misc_commands/sp.pl b/tp/t/results/misc_commands/sp.pl
index 857a753efe..9232e332cd 100644
--- a/tp/t/results/misc_commands/sp.pl
+++ b/tp/t/results/misc_commands/sp.pl
@@ -147,7 +147,7 @@ $result_trees{'sp'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'source_info' => {
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index c078eb1551..68e78ec72a 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -35,7 +35,7 @@ $result_trees{'test_allowcodebreaks'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'test_allowcodebreaks'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -89,7 +89,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Out of code --- out-of-code.
@@ -178,7 +178,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -609,7 +609,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1084,7 +1084,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1526,7 +1526,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2003,7 +2003,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index d4b0d623d8..8a13acc0a4 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -80,7 +80,7 @@ $result_trees{'text_before_line_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'text_before_line_command'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -173,7 +173,7 @@ $result_trees{'text_before_line_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index ad7de64432..a3426d53cc 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'anchor_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -152,7 +152,7 @@ $result_trees{'anchor_in_footnote'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'anchor_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -307,7 +307,7 @@ $result_trees{'anchor_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index d7be882712..e7c64f48f7 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -64,7 +64,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -100,7 +100,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -186,7 +186,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -305,7 +305,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -341,7 +341,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 6b9e5acec4..110dbbcb3f 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
@@ -69,7 +69,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -105,7 +105,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -191,7 +191,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -310,7 +310,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -346,7 +346,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 3584020ce1..3035df5532 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -35,7 +35,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -157,7 +157,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -276,7 +276,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -312,7 +312,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/chapter_sections.pl 
b/tp/t/results/moresectioning/chapter_sections.pl
index a6d6d96880..1118daf12d 100644
--- a/tp/t/results/moresectioning/chapter_sections.pl
+++ b/tp/t/results/moresectioning/chapter_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -120,7 +120,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -166,7 +166,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -212,7 +212,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -258,7 +258,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -304,7 +304,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -350,7 +350,7 @@ $result_trees{'chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 9a2f64d76f..237114739e 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -35,7 +35,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -72,7 +72,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -94,7 +94,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -264,7 +264,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -301,7 +301,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -858,7 +858,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -895,7 +895,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -917,7 +917,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1197,7 +1197,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1290,7 +1290,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1367,7 +1367,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 e761d87f8b..f083b3ad3f 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
@@ -27,7 +27,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -74,7 +74,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -96,7 +96,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -270,7 +270,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -309,7 +309,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -870,7 +870,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -909,7 +909,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -931,7 +931,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -1215,7 +1215,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1314,7 +1314,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1397,7 +1397,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 6135648f29..5914a18e1d 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -22,7 +22,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -39,7 +39,7 @@ $result_trees{'complex'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -438,7 +438,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -480,7 +480,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -511,7 +511,7 @@ $result_trees{'complex'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -823,7 +823,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -845,7 +845,7 @@ $result_trees{'complex'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1110,7 +1110,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1152,7 +1152,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1192,7 +1192,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1234,7 +1234,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1274,7 +1274,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1316,7 +1316,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1356,7 +1356,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1398,7 +1398,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1438,7 +1438,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1480,7 +1480,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1502,7 +1502,7 @@ $result_trees{'complex'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1626,7 +1626,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1668,7 +1668,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1713,7 +1713,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1755,7 +1755,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1797,7 +1797,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -1857,7 +1857,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1917,7 +1917,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2008,7 +2008,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -2069,7 +2069,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2123,7 +2123,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -2165,7 +2165,7 @@ $result_trees{'complex'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2284,7 +2284,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -2357,7 +2357,7 @@ $result_trees{'complex'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl 
b/tp/t/results/moresectioning/complex_split_at_node.pl
index 2155352717..1d6870100b 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -64,7 +64,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -106,7 +106,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'cmdname' => 'menu',
@@ -123,7 +123,7 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -515,7 +515,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -554,7 +554,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -585,7 +585,7 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -823,7 +823,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -862,7 +862,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -884,7 +884,7 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -1152,7 +1152,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1191,7 +1191,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1234,7 +1234,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1273,7 +1273,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1316,7 +1316,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1355,7 +1355,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1398,7 +1398,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1437,7 +1437,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1480,7 +1480,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1519,7 +1519,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1541,7 +1541,7 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -1668,7 +1668,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1707,7 +1707,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1755,7 +1755,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1794,7 +1794,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -1861,7 +1861,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1958,7 +1958,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2016,7 +2016,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -2075,7 +2075,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2114,7 +2114,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -2232,7 +2232,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2271,7 +2271,7 @@ $result_trees{'complex_split_at_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -2367,7 +2367,7 @@ $result_trees{'complex_split_at_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/contents.pl 
b/tp/t/results/moresectioning/contents.pl
index be9ccdb181..ee37520670 100644
--- a/tp/t/results/moresectioning/contents.pl
+++ b/tp/t/results/moresectioning/contents.pl
@@ -35,7 +35,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/contents_and_shortcontents.pl 
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
index cbaa6ced7e..a7b0902245 100644
--- a/tp/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/moresectioning/contents_and_shortcontents.pl
@@ -35,7 +35,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl 
b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
index e490ee8a8d..258585dddc 100644
--- a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
+++ b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
@@ -51,7 +51,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -125,7 +125,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl 
b/tp/t/results/moresectioning/contents_at_end_document.pl
index 1d35375b7f..fb9407c4bb 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -30,7 +30,7 @@ $result_trees{'contents_at_end_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'contents_at_end_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'contents_at_end_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
index 90b422135b..1e25dafd18 100644
--- a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -30,7 +30,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -269,7 +269,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/contents_in_document.pl 
b/tp/t/results/moresectioning/contents_in_document.pl
index 63ab1fafb1..c0392bdcc9 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -30,7 +30,7 @@ $result_trees{'contents_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'contents_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'contents_in_document'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/empty_top_node_up.pl 
b/tp/t/results/moresectioning/empty_top_node_up.pl
index ba1011e4b1..65e9e73cc1 100644
--- a/tp/t/results/moresectioning/empty_top_node_up.pl
+++ b/tp/t/results/moresectioning/empty_top_node_up.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_top_node_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'empty_top_node_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'empty_top_node_up'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'empty_top_node_up'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index b13282d3e8..cc63bd0c7f 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -62,7 +62,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -84,7 +84,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -219,7 +219,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -270,7 +270,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/moresectioning/internal_top_node_up.pl 
b/tp/t/results/moresectioning/internal_top_node_up.pl
index 7588977a00..1b091899a8 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -27,7 +27,7 @@ $result_trees{'internal_top_node_up'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -68,7 +68,7 @@ $result_trees{'internal_top_node_up'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -90,7 +90,7 @@ $result_trees{'internal_top_node_up'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -213,7 +213,7 @@ $result_trees{'internal_top_node_up'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index ed2c5d1f69..3587471a3f 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -30,7 +30,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -61,7 +61,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -83,7 +83,7 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -197,7 +197,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -233,7 +233,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -255,7 +255,7 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -376,7 +376,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -412,7 +412,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -434,7 +434,7 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -555,7 +555,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -591,7 +591,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -613,7 +613,7 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -780,7 +780,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -816,7 +816,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -866,7 +866,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -902,7 +902,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -924,7 +924,7 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1046,7 +1046,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1082,7 +1082,7 @@ $result_trees{'lowered_subsubsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'raisesections',
diff --git a/tp/t/results/moresectioning/loweredheading.pl 
b/tp/t/results/moresectioning/loweredheading.pl
index e36d3abecf..118afacf35 100644
--- a/tp/t/results/moresectioning/loweredheading.pl
+++ b/tp/t/results/moresectioning/loweredheading.pl
@@ -42,7 +42,7 @@ $result_trees{'loweredheading'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'heading',
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 35ad39788e..64c762ed50 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -30,7 +30,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -299,7 +299,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -339,7 +339,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -375,7 +375,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -415,7 +415,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -516,7 +516,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -552,7 +552,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -574,7 +574,7 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -695,7 +695,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -735,7 +735,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -771,7 +771,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -811,7 +811,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -851,7 +851,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -891,7 +891,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -931,7 +931,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1006,7 +1006,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1042,7 +1042,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1082,7 +1082,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
index 28b0d3017a..0a3edec206 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
@@ -35,7 +35,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -304,7 +304,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -344,7 +344,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -380,7 +380,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -420,7 +420,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -521,7 +521,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -557,7 +557,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -579,7 +579,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -700,7 +700,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -740,7 +740,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -776,7 +776,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -816,7 +816,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -856,7 +856,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -896,7 +896,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -936,7 +936,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1011,7 +1011,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1047,7 +1047,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1087,7 +1087,7 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index 4436bc13e9..b8aba02a8c 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -326,7 +326,7 @@ $result_trees{'no_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -444,7 +444,7 @@ $result_trees{'no_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 b601cb801b..b02d324493 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -72,7 +72,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -127,7 +127,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -215,7 +215,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -270,7 +270,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -306,7 +306,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 746053376a..4c86003a5d 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
@@ -35,7 +35,7 @@ $result_trees{'nodes_no_section_footnote_no_top_node_output'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'nodes_no_section_footnote_no_top_node_output'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index 4976a0df26..685a5923b2 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
@@ -180,7 +180,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -243,7 +243,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -460,7 +460,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 11c45281d5..9d51cd2dc5 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
@@ -180,7 +180,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -243,7 +243,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -460,7 +460,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
index e6df2fcd41..bb6950dffd 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
@@ -98,7 +98,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -139,7 +139,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -161,7 +161,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -337,7 +337,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/only_special_spaces_node.pl 
b/tp/t/results/moresectioning/only_special_spaces_node.pl
index 633928bbd0..7e5f79743e 100644
--- a/tp/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tp/t/results/moresectioning/only_special_spaces_node.pl
@@ -43,7 +43,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -79,7 +79,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -116,7 +116,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -152,7 +152,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -186,7 +186,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -214,7 +214,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -248,7 +248,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -276,7 +276,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -315,7 +315,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -351,7 +351,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -390,7 +390,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -426,7 +426,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -465,7 +465,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -501,7 +501,7 @@ $result_trees{'only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 41d1da7929..7f8d0c0085 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -258,7 +258,7 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -376,7 +376,7 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -527,7 +527,7 @@ $result_trees{'placed_things_before_element'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 ff68079709..de6171f773 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
@@ -258,7 +258,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -376,7 +376,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -527,7 +527,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index 7ea8b5e5ee..3d84d082ae 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -261,7 +261,7 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -379,7 +379,7 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -530,7 +530,7 @@ $result_trees{'placed_things_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -566,7 +566,7 @@ $result_trees{'placed_things_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -604,7 +604,7 @@ $result_trees{'placed_things_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -640,7 +640,7 @@ $result_trees{'placed_things_before_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index 38cce03313..a842593b67 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -55,7 +55,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -86,7 +86,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -103,7 +103,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -263,7 +263,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -299,7 +299,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -321,7 +321,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
@@ -347,7 +347,7 @@ $result_trees{'raiselowersections'} = {
                             'type' => 'block_line_arg'
                           }
                         ],
-                        'type' => 'argument'
+                        'type' => 'arguments_line'
                       }
                     ],
                     'info' => {
@@ -545,7 +545,7 @@ $result_trees{'raiselowersections'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'info' => {
@@ -644,7 +644,7 @@ $result_trees{'raiselowersections'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@node Top
@@ -764,7 +764,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -801,7 +801,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -823,7 +823,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -949,7 +949,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -986,7 +986,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1008,7 +1008,7 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1134,7 +1134,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1171,7 +1171,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
@@ -1197,7 +1197,7 @@ $result_trees{'raiselowersections'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@menu
@@ -1303,7 +1303,7 @@ $result_trees{'raiselowersections'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => '@contents
@@ -1475,7 +1475,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1511,7 +1511,7 @@ $result_trees{'raiselowersections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/rec_nodes.pl 
b/tp/t/results/moresectioning/rec_nodes.pl
index 0b7946a209..fe71e8679c 100644
--- a/tp/t/results/moresectioning/rec_nodes.pl
+++ b/tp/t/results/moresectioning/rec_nodes.pl
@@ -30,7 +30,7 @@ $result_trees{'rec_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -264,7 +264,7 @@ $result_trees{'rec_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -286,7 +286,7 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -476,7 +476,7 @@ $result_trees{'rec_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -498,7 +498,7 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -642,7 +642,7 @@ $result_trees{'rec_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'menu',
@@ -659,7 +659,7 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -817,7 +817,7 @@ $result_trees{'rec_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -848,7 +848,7 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index 4da691ff22..7e5e3c7dd6 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -45,7 +45,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -82,7 +82,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -138,7 +138,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -449,7 +449,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -486,7 +486,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -508,7 +508,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -633,7 +633,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -670,7 +670,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -711,7 +711,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -748,7 +748,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -770,7 +770,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -893,7 +893,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -930,7 +930,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -969,7 +969,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1006,7 +1006,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1028,7 +1028,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1200,7 +1200,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1237,7 +1237,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1259,7 +1259,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1523,7 +1523,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1560,7 +1560,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1599,7 +1599,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1636,7 +1636,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1675,7 +1675,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1712,7 +1712,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1751,7 +1751,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1788,7 +1788,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1827,7 +1827,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1864,7 +1864,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1886,7 +1886,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2009,7 +2009,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2046,7 +2046,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2090,7 +2090,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2127,7 +2127,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2149,7 +2149,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2462,7 +2462,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2499,7 +2499,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2521,7 +2521,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2785,7 +2785,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2822,7 +2822,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2861,7 +2861,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2898,7 +2898,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2937,7 +2937,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2974,7 +2974,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3013,7 +3013,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3050,7 +3050,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3089,7 +3089,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3126,7 +3126,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3167,7 +3167,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3204,7 +3204,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3226,7 +3226,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3349,7 +3349,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3386,7 +3386,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3425,7 +3425,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3462,7 +3462,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3484,7 +3484,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3609,7 +3609,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3646,7 +3646,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3687,7 +3687,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3724,7 +3724,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3746,7 +3746,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3869,7 +3869,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3906,7 +3906,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3945,7 +3945,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3982,7 +3982,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4004,7 +4004,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4127,7 +4127,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4164,7 +4164,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4186,7 +4186,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4450,7 +4450,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4487,7 +4487,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4526,7 +4526,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4563,7 +4563,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4602,7 +4602,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4639,7 +4639,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4678,7 +4678,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4715,7 +4715,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index 711625ee1b..e2dcff0214 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -45,7 +45,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -82,7 +82,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -138,7 +138,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -449,7 +449,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -486,7 +486,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -508,7 +508,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -633,7 +633,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -670,7 +670,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -711,7 +711,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -748,7 +748,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -770,7 +770,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -893,7 +893,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -930,7 +930,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -969,7 +969,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1006,7 +1006,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1028,7 +1028,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1200,7 +1200,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1237,7 +1237,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1259,7 +1259,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1523,7 +1523,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1560,7 +1560,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1599,7 +1599,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1636,7 +1636,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1675,7 +1675,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1712,7 +1712,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1751,7 +1751,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1788,7 +1788,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1827,7 +1827,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1864,7 +1864,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1886,7 +1886,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2009,7 +2009,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2046,7 +2046,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2090,7 +2090,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2127,7 +2127,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2149,7 +2149,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2462,7 +2462,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2499,7 +2499,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2521,7 +2521,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2785,7 +2785,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2822,7 +2822,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2861,7 +2861,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2898,7 +2898,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -2937,7 +2937,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -2974,7 +2974,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3013,7 +3013,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3050,7 +3050,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3089,7 +3089,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3126,7 +3126,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3167,7 +3167,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3204,7 +3204,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3226,7 +3226,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3349,7 +3349,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3386,7 +3386,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3425,7 +3425,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3462,7 +3462,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3484,7 +3484,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3609,7 +3609,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3646,7 +3646,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3687,7 +3687,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3724,7 +3724,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3746,7 +3746,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -3869,7 +3869,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3906,7 +3906,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -3945,7 +3945,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -3982,7 +3982,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4004,7 +4004,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4127,7 +4127,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4164,7 +4164,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4186,7 +4186,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -4450,7 +4450,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4487,7 +4487,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4526,7 +4526,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4563,7 +4563,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4602,7 +4602,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4639,7 +4639,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -4678,7 +4678,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -4715,7 +4715,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix.pl
index 61462cdb3c..adf2dfcccc 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -120,7 +120,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -166,7 +166,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -212,7 +212,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -258,7 +258,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -287,7 +287,7 @@ $result_trees{'sectioning_part_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -343,7 +343,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -389,7 +389,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -433,7 +433,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -479,7 +479,7 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
index 95da119210..f4337186ec 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
@@ -27,7 +27,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -76,7 +76,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -122,7 +122,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -168,7 +168,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -214,7 +214,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -243,7 +243,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -299,7 +299,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -345,7 +345,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -389,7 +389,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -435,7 +435,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
index 75913133e2..851acf6d54 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
@@ -35,7 +35,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/sections_test.pl 
b/tp/t/results/moresectioning/sections_test.pl
index bcb351f577..e94d9569b2 100644
--- a/tp/t/results/moresectioning/sections_test.pl
+++ b/tp/t/results/moresectioning/sections_test.pl
@@ -35,7 +35,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'sections_test'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
index 117edfa12e..20a6a3962b 100644
--- a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
index 1ab0ffed74..96e3bd8792 100644
--- 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -35,7 +35,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/shortcontents.pl 
b/tp/t/results/moresectioning/shortcontents.pl
index 3705bb96ed..1a9d6887fd 100644
--- a/tp/t/results/moresectioning/shortcontents.pl
+++ b/tp/t/results/moresectioning/shortcontents.pl
@@ -35,7 +35,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -153,7 +153,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -193,7 +193,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -271,7 +271,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -312,7 +312,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -352,7 +352,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -390,7 +390,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -430,7 +430,7 @@ $result_trees{'shortcontents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index 87d81c9a1c..202209b18a 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -43,7 +43,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -79,7 +79,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -116,7 +116,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -152,7 +152,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -176,7 +176,7 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "block_line_arg"
                 }
               ],
-              "type" => "argument"
+              "type" => "arguments_line"
             },
             {
               "contents" => [
@@ -619,7 +619,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -659,7 +659,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -699,7 +699,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -739,7 +739,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -779,7 +779,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -819,7 +819,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -859,7 +859,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -899,7 +899,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/moresectioning/top_chapter_sections.pl 
b/tp/t/results/moresectioning/top_chapter_sections.pl
index b6195277cc..2b838bac05 100644
--- a/tp/t/results/moresectioning/top_chapter_sections.pl
+++ b/tp/t/results/moresectioning/top_chapter_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -118,7 +118,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -164,7 +164,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -210,7 +210,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -256,7 +256,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -302,7 +302,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -348,7 +348,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -394,7 +394,7 @@ $result_trees{'top_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl 
b/tp/t/results/moresectioning/top_node_up_url.pl
index ea9e46545e..2e6618c40b 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -27,7 +27,7 @@ $result_trees{'top_node_up_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -68,7 +68,7 @@ $result_trees{'top_node_up_url'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -90,7 +90,7 @@ $result_trees{'top_node_up_url'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -213,7 +213,7 @@ $result_trees{'top_node_up_url'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/moresectioning/topic_guide.pl 
b/tp/t/results/moresectioning/topic_guide.pl
index da4346a427..abd4de331a 100644
--- a/tp/t/results/moresectioning/topic_guide.pl
+++ b/tp/t/results/moresectioning/topic_guide.pl
@@ -50,7 +50,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -127,7 +127,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -297,7 +297,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -334,7 +334,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -370,7 +370,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -608,7 +608,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -644,7 +644,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -829,7 +829,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -865,7 +865,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1050,7 +1050,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1086,7 +1086,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1184,7 +1184,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1220,7 +1220,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1392,7 +1392,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1428,7 +1428,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1620,7 +1620,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1657,7 +1657,7 @@ $result_trees{'topic_guide'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1693,7 +1693,7 @@ $result_trees{'topic_guide'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index e21c33ca18..8f610909bc 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -54,7 +54,7 @@ $result_trees{'empty_headitem'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index c575eb2a62..095f28b316 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -52,7 +52,7 @@ $result_trees{'empty_item_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -261,7 +261,7 @@ $result_trees{'empty_item_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index b10bf8be6d..72b8e9ceb8 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/fullwidth_in_prototype.pl 
b/tp/t/results/multitable/fullwidth_in_prototype.pl
index 72992f00b7..11fd22990c 100644
--- a/tp/t/results/multitable/fullwidth_in_prototype.pl
+++ b/tp/t/results/multitable/fullwidth_in_prototype.pl
@@ -65,7 +65,7 @@ $result_trees{'fullwidth_in_prototype'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 100e882bdf..19b6aaa550 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -37,7 +37,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -275,7 +275,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -606,7 +606,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index c36beb381a..9df8e7b949 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -161,7 +161,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl 
b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
index 6ab00384e9..b064c32b27 100644
--- a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
+++ b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
@@ -53,7 +53,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
index 23186257e7..1ad92cace2 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
@@ -37,7 +37,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index b743c41f04..bcf39226bf 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -43,7 +43,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
index 82cd41204c..a7eb1c0be2 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
@@ -37,7 +37,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index 62af49ae22..d812adf408 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -48,7 +48,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
index 6abd7a4087..0d49a05dcd 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -42,7 +42,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index 030fc03e46..3149d86ef6 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -46,7 +46,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index 26018fc28a..103d4b4c2d 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -46,7 +46,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl 
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index 410c30854a..885d483b96 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index 5cfb8d9018..5753e71ddd 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_figure_space'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index bc2f653974..04c922f578 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'multitable_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'multitable',
@@ -68,7 +68,7 @@ $result_trees{'multitable_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/multitable/multitable_not_closed.pl 
b/tp/t/results/multitable/multitable_not_closed.pl
index 78cd9ad1cc..805c76a719 100644
--- a/tp/t/results/multitable/multitable_not_closed.pl
+++ b/tp/t/results/multitable/multitable_not_closed.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             }
           ],
           'extra' => {
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl 
b/tp/t/results/multitable/multitable_not_closed_item.pl
index f7423a60f3..a516fe6033 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_not_closed_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl 
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index ec3af7b9d4..c162f1b1f7 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl 
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index 7b0127d129..4df07c1ac3 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -37,7 +37,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl 
b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
index f4487e22e3..18c04f6b10 100644
--- a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
@@ -53,7 +53,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl 
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index cf504abb61..be5653982a 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -53,7 +53,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index fcc325d34a..447cd12c98 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -29,7 +29,7 @@ $result_trees{'not_letters_in_prototype'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index 7049f357eb..8f4187d8a6 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -51,7 +51,7 @@ $result_trees{'paragraph_in_cells'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl 
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 86040f270a..c86af6d330 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -40,7 +40,7 @@ $result_trees{'prototype_brace_no_brace'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl 
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 4f9b29c095..97e94e7faa 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -46,7 +46,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index 8a4bf859dc..ea1d282cd2 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -48,7 +48,7 @@ $result_trees{'prototype_no_brace'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 5b4733de27..ac6310ecb7 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -114,7 +114,7 @@ $result_trees{'ref_in_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index 3c19cbf66b..d658e1dfd6 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -51,7 +51,7 @@ $result_trees{'w_in_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 1aed06b99f..32da37f46e 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -24,7 +24,7 @@ $result_trees{'commands_in_flushright'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -46,7 +46,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -117,7 +117,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -188,7 +188,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -309,7 +309,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -495,7 +495,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -713,7 +713,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -875,7 +875,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -941,7 +941,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1007,7 +1007,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index 8f0f67c59e..3d140ceb10 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -29,7 +29,7 @@ $result_trees{'comment_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -104,7 +104,7 @@ $result_trees{'comment_in_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 307cef569a..e1d321e4d2 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
@@ -101,7 +101,7 @@ $result_trees{'indent_before_macro_definition_and_other'} = 
{
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -164,7 +164,7 @@ $result_trees{'indent_before_macro_definition_and_other'} = 
{
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   },
                   {
                     'text' => 'not html
@@ -313,7 +313,7 @@ $result_trees{'indent_before_macro_definition_and_other'} = 
{
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'll /g/
diff --git a/tp/t/results/paragraph/paragraph_count_and_example.pl 
b/tp/t/results/paragraph/paragraph_count_and_example.pl
index 2265298909..ab74a45009 100644
--- a/tp/t/results/paragraph/paragraph_count_and_example.pl
+++ b/tp/t/results/paragraph/paragraph_count_and_example.pl
@@ -24,7 +24,7 @@ $result_trees{'paragraph_count_and_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index 3b11e1a2ba..b081c8f3c3 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -83,7 +83,7 @@ $result_trees{'paragraph_indent_asis'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '  ',
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index bd92c93427..a55bae2867 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -71,7 +71,7 @@ $result_trees{'all_spaces'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -107,7 +107,7 @@ $result_trees{'all_spaces'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
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 ae2532fe4d..efb7de2e1c 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
@@ -24,7 +24,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl 
b/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
index b8039cf178..e9c74a369a 100644
--- a/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
+++ b/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
@@ -30,7 +30,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -195,7 +195,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -308,7 +308,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -344,7 +344,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -371,7 +371,7 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index ea38107d16..74de495c2b 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -112,7 +112,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -149,7 +149,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -202,7 +202,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -239,7 +239,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl 
b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
index 7471cf7a89..083d75df63 100644
--- a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
+++ b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_line_in_example_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl 
b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
index aa65a26c9d..6a929c2390 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -29,7 +29,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -67,7 +67,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'cmdname' => 'end',
diff --git a/tp/t/results/plaintext_tests/expanded_tex.pl 
b/tp/t/results/plaintext_tests/expanded_tex.pl
index 2b809261a2..bbc16e2c6b 100644
--- a/tp/t/results/plaintext_tests/expanded_tex.pl
+++ b/tp/t/results/plaintext_tests/expanded_tex.pl
@@ -30,7 +30,7 @@ $result_trees{'expanded_tex'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl 
b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
index a1578ff362..14b465a0e2 100644
--- a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
+++ b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
@@ -24,7 +24,7 @@ $result_trees{'flushright_not_closed_and_format'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -55,7 +55,7 @@ $result_trees{'flushright_not_closed_and_format'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/html_expanded.pl 
b/tp/t/results/plaintext_tests/html_expanded.pl
index d51fd8fc03..a2584dd51e 100644
--- a/tp/t/results/plaintext_tests/html_expanded.pl
+++ b/tp/t/results/plaintext_tests/html_expanded.pl
@@ -30,7 +30,7 @@ $result_trees{'html_expanded'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl 
b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
index f6686b2f4b..a5d6460978 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -24,7 +24,7 @@ $result_trees{'insert_copying_and_paragraph'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/isolated_html_expanded.pl 
b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
index 642b4b8c03..30f77c3018 100644
--- a/tp/t/results/plaintext_tests/isolated_html_expanded.pl
+++ b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
@@ -29,7 +29,7 @@ $result_trees{'isolated_html_expanded'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl 
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index c5ff837b96..7c5b2eeeb0 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'itemize',
@@ -49,7 +49,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -140,7 +140,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
@@ -250,7 +250,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -365,7 +365,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'item',
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 9f8b5beb1a..6dc2bf852a 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -184,7 +184,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -221,7 +221,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -243,7 +243,7 @@ $result_trees{'japanese_utf8'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -419,7 +419,7 @@ $result_trees{'japanese_utf8'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -589,7 +589,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -626,7 +626,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -686,7 +686,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -723,7 +723,7 @@ $result_trees{'japanese_utf8'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index 5ebe5b1fb2..d5b374a720 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -30,7 +30,7 @@ $result_trees{'line_passed_and_formats'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -57,7 +57,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -83,7 +83,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -193,7 +193,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -219,7 +219,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -320,7 +320,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -346,7 +346,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -447,7 +447,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -508,7 +508,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -574,7 +574,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -635,7 +635,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -701,7 +701,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -727,7 +727,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -837,7 +837,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -863,7 +863,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -973,7 +973,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -999,7 +999,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1118,7 +1118,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1202,7 +1202,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1286,7 +1286,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -1380,7 +1380,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1488,7 +1488,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -1510,7 +1510,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -1635,7 +1635,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -1657,7 +1657,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1772,7 +1772,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1799,7 +1799,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1929,7 +1929,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1956,7 +1956,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -2076,7 +2076,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 443b3533ba..663a36e037 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -32,7 +32,7 @@ $result_trees{'long_uref_after_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
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 9f4bc76f4a..18e747ce15 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -228,7 +228,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index 4b833c4df8..4527f06747 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -51,7 +51,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -258,7 +258,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1130,7 +1130,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1378,7 +1378,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1543,7 +1543,7 @@ $result_trees{'multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
index 4aaf77785f..61215a1365 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
@@ -24,7 +24,7 @@ $result_trees{'multitable_in_example_extraneous_item_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'multitable',
@@ -46,7 +46,7 @@ $result_trees{'multitable_in_example_extraneous_item_tab'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 8bb5144499..b0c98604f2 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -24,7 +24,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'multitable',
@@ -54,7 +54,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index 2c23346250..6215daea02 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -322,7 +322,7 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -676,7 +676,7 @@ $result_trees{'nested_code_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index 5780755884..9b9741673d 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_indentedblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'nested_indentedblock'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -151,7 +151,7 @@ $result_trees{'nested_indentedblock'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '   ',
@@ -181,7 +181,7 @@ $result_trees{'nested_indentedblock'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index f24a19a534..87ab9ef66c 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -62,7 +62,7 @@ $result_trees{'nested_multitable'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -118,7 +118,7 @@ $result_trees{'nested_multitable'} = {
                                   'type' => 'block_line_arg'
                                 }
                               ],
-                              'type' => 'argument'
+                              'type' => 'arguments_line'
                             },
                             {
                               'contents' => [
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 d360598dfe..405ffe2b4a 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
@@ -41,7 +41,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'c',
@@ -157,7 +157,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -254,7 +254,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'cmdname' => 'indent',
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index 73e15cd29b..a1caa04cde 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -74,7 +74,7 @@ $result_trees{'non_break_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 4fa8c7f59e..c503a5b0fb 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -81,7 +81,7 @@ $result_trees{'protect_spaces_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'exdent',
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 dd1072378a..e0a9303ea4 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
@@ -50,7 +50,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
index 17178611db..5a8e0327af 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
index da5f6a90cd..eca81fda0e 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
index 9564dbd03b..2aeb9ce622 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -50,7 +50,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
index 14755ec985..9d2f976688 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
index 9550dde903..03c48059a8 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
index 4d998b925e..96facb94e5 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
@@ -50,7 +50,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
index 300c31e24d..5b06e884d2 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
@@ -89,7 +89,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
index 5bc17d6325..d5e5f77228 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
@@ -89,7 +89,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
index 56eb1f6226..2551f1c28a 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
@@ -89,7 +89,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
index 823d23eff4..4cc5deaa39 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
@@ -89,7 +89,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
index fea2bfa9d0..9d91e2426b 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
index e9c243f716..dca42b6bbf 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
@@ -89,7 +89,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -202,7 +202,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 5df1bf9d45..00e531f82f 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -35,7 +35,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -67,7 +67,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1015,7 +1015,7 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1441,7 +1441,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1478,7 +1478,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1533,7 +1533,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1570,7 +1570,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1748,7 +1748,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1785,7 +1785,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1840,7 +1840,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1891,7 +1891,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1932,7 +1932,7 @@ $result_trees{'quote_node_names'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
index 2adf25ad61..221be33c3d 100644
--- a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -59,7 +59,7 @@ $result_trees{'settitle_and_empty_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl 
b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
index ef2f7ee70b..ebff441c75 100644
--- a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
+++ b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
@@ -29,7 +29,7 @@ $result_trees{'sp_with_text_before_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 0967d485da..c0ada72227 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -20,7 +20,7 @@ $result_trees{'star_at_command_formatting'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Some text @*
@@ -388,7 +388,7 @@ $result_trees{'star_at_command_formatting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -686,7 +686,7 @@ $result_trees{'star_at_command_formatting'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl 
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index 08ce743eb0..83e259ba83 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'tab_in_table_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'table',
@@ -49,7 +49,7 @@ $result_trees{'tab_in_table_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/tab_item_in_example.pl 
b/tp/t/results/plaintext_tests/tab_item_in_example.pl
index 3677097109..712e073580 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'tab_item_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 89c95ab529..43383561ad 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -29,7 +29,7 @@ $result_trees{'caption_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -51,7 +51,7 @@ $result_trees{'caption_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index 00e420c68f..df24f2a173 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -38,7 +38,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -211,7 +211,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index 78c7dbd360..dff593ddad 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -33,7 +33,7 @@ $result_trees{'comments_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'comments_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -214,7 +214,7 @@ $result_trees{'comments_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index ce2437747b..a7c67b541d 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'def_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'defun',
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index e531696145..3deff64c4f 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index 606827e601..bb0a1fcf9b 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_line_style_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/example_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_at_commands_arguments.pl
index d8147f2544..524d81d714 100644
--- a/tp/t/results/preformatted/example_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_at_commands_arguments.pl
@@ -139,7 +139,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/example_class.pl 
b/tp/t/results/preformatted/example_class.pl
index 6c73e23ec1..0b2322b457 100644
--- a/tp/t/results/preformatted/example_class.pl
+++ b/tp/t/results/preformatted/example_class.pl
@@ -29,7 +29,7 @@ $result_trees{'example_class'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/example_empty_arguments.pl 
b/tp/t/results/preformatted/example_empty_arguments.pl
index 6ab3cc4c8f..09a9f177fb 100644
--- a/tp/t/results/preformatted/example_empty_arguments.pl
+++ b/tp/t/results/preformatted/example_empty_arguments.pl
@@ -42,7 +42,7 @@ $result_trees{'example_empty_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -141,7 +141,7 @@ $result_trees{'example_empty_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -235,7 +235,7 @@ $result_trees{'example_empty_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 1560d996ff..a5d6aad95d 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -144,7 +144,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/preformatted/example_multi_class.pl 
b/tp/t/results/preformatted/example_multi_class.pl
index cf541ed78e..d17434dfe9 100644
--- a/tp/t/results/preformatted/example_multi_class.pl
+++ b/tp/t/results/preformatted/example_multi_class.pl
@@ -71,7 +71,7 @@ $result_trees{'example_multi_class'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index d92e27b592..2d686a2a87 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'insertcopying_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'insertcopying',
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index fd356073de..8ea637f087 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_example_and_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -59,7 +59,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -169,7 +169,7 @@ $result_trees{'nested_example_and_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -204,7 +204,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -323,7 +323,7 @@ $result_trees{'nested_example_and_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -358,7 +358,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index 86aa230dcd..72c0836bf8 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -24,7 +24,7 @@ $result_trees{'nested_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -41,7 +41,7 @@ $result_trees{'nested_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -152,7 +152,7 @@ $result_trees{'nested_formats'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'format',
@@ -169,7 +169,7 @@ $result_trees{'nested_formats'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index 8640e6c197..9f46a602f8 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'page_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'page',
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index 3e78bd6773..8ec42aad11 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -29,7 +29,7 @@ $result_trees{'quote_dash_in_display'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index 9e4871aa8f..e271ea9957 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -29,7 +29,7 @@ $result_trees{'quote_dash_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl 
b/tp/t/results/preformatted/text_on_display_command_line.pl
index e6a5b9150d..bc576ec5b6 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -29,7 +29,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -96,7 +96,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -167,7 +167,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -233,7 +233,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'display',
@@ -250,7 +250,7 @@ $result_trees{'text_on_display_command_line'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'end',
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl 
b/tp/t/results/preformatted/text_on_example_command_line.pl
index b5c653b2fe..22de2f7f43 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -29,7 +29,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -96,7 +96,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -167,7 +167,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -233,7 +233,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'example',
@@ -250,7 +250,7 @@ $result_trees{'text_on_example_command_line'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'end',
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 61c13c81d1..0ee7e98abb 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'titlefont_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'titlefont',
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index c386fd9ed2..3927f0a26f 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -38,7 +38,7 @@ $result_trees{'comment_on_quotation_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 5ec2152fa4..9307680e3d 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -86,7 +86,7 @@ $result_trees{'empty_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -161,7 +161,7 @@ $result_trees{'empty_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -228,7 +228,7 @@ $result_trees{'empty_quotation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
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 f5342eadb0..508a2d2c74 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -29,7 +29,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/quotation/only_comment_on_quotation_line.pl 
b/tp/t/results/quotation/only_comment_on_quotation_line.pl
index 1f3f54d5b0..b890964bbc 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -30,7 +30,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index bdd73551bf..8fb3a93a5f 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -38,7 +38,7 @@ $result_trees{'quotation_and_author'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'author',
@@ -153,7 +153,7 @@ $result_trees{'quotation_and_author'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'author',
@@ -259,7 +259,7 @@ $result_trees{'quotation_and_author'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'author',
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 3a22901b08..cc63ea40d7 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'quotation_author_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -41,7 +41,7 @@ $result_trees{'quotation_author_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl 
b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
index a8d3803c10..897844cab1 100644
--- a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
+++ b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
@@ -28,7 +28,7 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl 
b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
index fa3a748de4..2d834ef654 100644
--- a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
+++ b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
@@ -30,7 +30,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/quotation/standard_quotations.pl 
b/tp/t/results/quotation/standard_quotations.pl
index f6c06e10fc..7cb8f1c8f1 100644
--- a/tp/t/results/quotation/standard_quotations.pl
+++ b/tp/t/results/quotation/standard_quotations.pl
@@ -29,7 +29,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -105,7 +105,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -257,7 +257,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -333,7 +333,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -409,7 +409,7 @@ $result_trees{'standard_quotations'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/beginning_and_end_on_line.pl 
b/tp/t/results/raw/beginning_and_end_on_line.pl
index 211693b98b..08d217364a 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -33,7 +33,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -99,7 +99,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -165,7 +165,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/raw/braces_in_tex.pl 
b/tp/t/results/raw/braces_in_tex.pl
index 1446ba938d..ab831dad15 100644
--- a/tp/t/results/raw/braces_in_tex.pl
+++ b/tp/t/results/raw/braces_in_tex.pl
@@ -29,7 +29,7 @@ $result_trees{'braces_in_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -116,7 +116,7 @@ $result_trees{'braces_in_tex'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'braces_in_tex'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/raw/comments_on_raw_block_line.pl 
b/tp/t/results/raw/comments_on_raw_block_line.pl
index 782a05c61e..72bf5e3a17 100644
--- a/tp/t/results/raw/comments_on_raw_block_line.pl
+++ b/tp/t/results/raw/comments_on_raw_block_line.pl
@@ -30,7 +30,7 @@ $result_trees{'comments_on_raw_block_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'comments_on_raw_block_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index 841b69cbf1..04ff83ff8d 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -24,7 +24,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\int_D ('
@@ -122,7 +122,7 @@ $result_trees{'displaymath'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\int_D ('
diff --git a/tp/t/results/raw/displaymath_not_closed.pl 
b/tp/t/results/raw/displaymath_not_closed.pl
index 45fee95eaf..48894efbb2 100644
--- a/tp/t/results/raw/displaymath_not_closed.pl
+++ b/tp/t/results/raw/displaymath_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'displaymath_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in displaymath
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 5df5188252..840ddfa670 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
@@ -29,7 +29,7 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -126,7 +126,7 @@ 
$result_trees{'empty_line_in_command_in_expanded_not_expanded'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index 4c469b3383..96a00c8454 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'inline_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/inlineraw_not_closed.pl 
b/tp/t/results/raw/inlineraw_not_closed.pl
index 090e6fdc0f..fe4496c871 100644
--- a/tp/t/results/raw/inlineraw_not_closed.pl
+++ b/tp/t/results/raw/inlineraw_not_closed.pl
@@ -71,7 +71,7 @@ $result_trees{'inlineraw_not_closed'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/raw/lone_braces_in_html.pl 
b/tp/t/results/raw/lone_braces_in_html.pl
index 02bcfc7878..b32b56061f 100644
--- a/tp/t/results/raw/lone_braces_in_html.pl
+++ b/tp/t/results/raw/lone_braces_in_html.pl
@@ -24,7 +24,7 @@ $result_trees{'lone_braces_in_html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'lone_braces_in_html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index a2ff9b6320..f67c14ef35 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -29,7 +29,7 @@ $result_trees{'misc_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'misc_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -161,7 +161,7 @@ $result_trees{'misc_raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in  v---erbatim`` <>
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index 2abc199aaf..17fe56c2fd 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -35,7 +35,7 @@ $result_trees{'misc_raw_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -116,7 +116,7 @@ $result_trees{'misc_raw_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -187,7 +187,7 @@ $result_trees{'misc_raw_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim @c in verbatim
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index 11f83a7223..ecd46213a7 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -20,7 +20,7 @@ $result_trees{'nested_macros'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in macro \\arg\\
diff --git a/tp/t/results/raw/raw_commands_and_end_of_lines.pl 
b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
index 00139c224b..669ac100e8 100644
--- a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
+++ b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
@@ -29,7 +29,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -101,7 +101,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -183,7 +183,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -261,7 +261,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -335,7 +335,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -413,7 +413,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -482,7 +482,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -554,7 +554,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -632,7 +632,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -710,7 +710,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -784,7 +784,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -862,7 +862,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -931,7 +931,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'Surrounded by empty lines.
@@ -1002,7 +1002,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in block
@@ -1081,7 +1081,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in block
@@ -1160,7 +1160,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in block
@@ -1230,7 +1230,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in block
@@ -1309,7 +1309,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in block
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index 8e5fa74c62..09f23fce13 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -35,7 +35,7 @@ $result_trees{'raw_expanded_in_style'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/raw/raw_in_example.pl 
b/tp/t/results/raw/raw_in_example.pl
index 8179cfe273..d94dad87cc 100644
--- a/tp/t/results/raw/raw_in_example.pl
+++ b/tp/t/results/raw/raw_in_example.pl
@@ -24,7 +24,7 @@ $result_trees{'raw_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -43,7 +43,7 @@ $result_trees{'raw_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -147,7 +147,7 @@ $result_trees{'raw_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -171,7 +171,7 @@ $result_trees{'raw_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -247,7 +247,7 @@ $result_trees{'raw_in_example'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index b0d35f4c36..15941e945e 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -33,7 +33,7 @@ $result_trees{'raw_in_para'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim
@@ -101,7 +101,7 @@ $result_trees{'raw_in_para'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -180,7 +180,7 @@ $result_trees{'raw_in_para'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index af3ebeae85..53e02fe79b 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -35,7 +35,7 @@ $result_trees{'raw_in_style'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/raw/raw_not_closed.pl 
b/tp/t/results/raw/raw_not_closed.pl
index 05480b3fc1..23816e3ec8 100644
--- a/tp/t/results/raw/raw_not_closed.pl
+++ b/tp/t/results/raw/raw_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'raw_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 2f7b36ffc1..d5ddfd66fd 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
@@ -24,7 +24,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -121,7 +121,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl 
b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
index bb37fba3fa..2e8cace43f 100644
--- a/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
@@ -24,7 +24,7 @@ 
$result_trees{'second_level_lone_braces_in_html_not_expanded'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -96,7 +96,7 @@ 
$result_trees{'second_level_lone_braces_in_html_not_expanded'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/space_before_end.pl 
b/tp/t/results/raw/space_before_end.pl
index cd104befd4..8004937887 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/space_before_end.pl
@@ -24,7 +24,7 @@ $result_trees{'space_before_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -93,7 +93,7 @@ $result_trees{'space_before_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim
@@ -159,7 +159,7 @@ $result_trees{'space_before_end'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl 
b/tp/t/results/raw/spurious_arg_on_line.pl
index d59f97e87a..76bf2a64f9 100644
--- a/tp/t/results/raw/spurious_arg_on_line.pl
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -34,7 +34,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -110,7 +110,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim
@@ -182,7 +182,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/tex_not_closed.pl 
b/tp/t/results/raw/tex_not_closed.pl
index 2054ea39ad..f51454562c 100644
--- a/tp/t/results/raw/tex_not_closed.pl
+++ b/tp/t/results/raw/tex_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'tex_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index 682327025d..b9ec0d4c9d 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -24,7 +24,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In verbatim                @@                        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa       bbbbbbbbbbbbbb
@@ -95,7 +95,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatime
@@ -166,7 +166,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -192,7 +192,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'In verbatim in quotation
@@ -303,7 +303,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'In verbatim test text
@@ -410,7 +410,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -561,7 +561,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -592,7 +592,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'In verbatim in example
@@ -704,7 +704,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -735,7 +735,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'In verbatim in quotation with spaces
@@ -842,7 +842,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -873,7 +873,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => 'In verbatim in quotation
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl 
b/tp/t/results/raw/verbatim_in_brace_command.pl
index e80ab898a1..94e573ef82 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -46,7 +46,7 @@ $result_trees{'verbatim_in_brace_command'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim
diff --git a/tp/t/results/raw/verbatim_not_closed.pl 
b/tp/t/results/raw/verbatim_not_closed.pl
index 7056b5f808..bb718c884e 100644
--- a/tp/t/results/raw/verbatim_not_closed.pl
+++ b/tp/t/results/raw/verbatim_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'verbatim_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 9b1bc1dcc0..517a75321e 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -36,7 +36,7 @@ $result_trees{'anchor_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -151,7 +151,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -192,7 +192,7 @@ $result_trees{'anchor_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 6bfd81a720..1e449951fd 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -173,7 +173,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -214,7 +214,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 621a14104b..39f92aaf1c 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -127,7 +127,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -160,7 +160,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -201,7 +201,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -236,7 +236,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index baa28ffac8..db22e6831e 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -26,7 +26,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -127,7 +127,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -160,7 +160,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -201,7 +201,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -236,7 +236,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/copying_not_closed.pl 
b/tp/t/results/regions/copying_not_closed.pl
index ff456c36b6..4aeaeefb5c 100644
--- a/tp/t/results/regions/copying_not_closed.pl
+++ b/tp/t/results/regions/copying_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'copying_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/regions/double_copying.pl 
b/tp/t/results/regions/double_copying.pl
index 7dd3e23ed2..b677c12d9c 100644
--- a/tp/t/results/regions/double_copying.pl
+++ b/tp/t/results/regions/double_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'double_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -60,7 +60,7 @@ $result_trees{'double_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/regions/double_titlepage_not_closed.pl 
b/tp/t/results/regions/double_titlepage_not_closed.pl
index 1cbcc3789d..36b7a7e187 100644
--- a/tp/t/results/regions/double_titlepage_not_closed.pl
+++ b/tp/t/results/regions/double_titlepage_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'double_titlepage_not_closed'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -65,7 +65,7 @@ $result_trees{'double_titlepage_not_closed'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index a6b75c6e6f..828cc98819 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -26,7 +26,7 @@ $result_trees{'format_in_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -48,7 +48,7 @@ $result_trees{'format_in_titlepage'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'format_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -201,7 +201,7 @@ $result_trees{'format_in_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 2cecda67b5..afadccf7e7 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -26,7 +26,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '
@@ -48,7 +48,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -201,7 +201,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 49a82c98a1..c111234f71 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'ref_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'ref_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'ref_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -204,7 +204,7 @@ $result_trees{'ref_in_copying'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -323,7 +323,7 @@ $result_trees{'ref_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -359,7 +359,7 @@ $result_trees{'ref_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 b76c6bd781..4fb26dd5a3 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
@@ -26,7 +26,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -163,7 +163,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -201,7 +201,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -237,7 +237,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -278,7 +278,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -399,7 +399,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -435,7 +435,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 50e32bd48c..ac7443784f 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'today_in_copying'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -114,7 +114,7 @@ $result_trees{'today_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -150,7 +150,7 @@ $result_trees{'today_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -188,7 +188,7 @@ $result_trees{'today_in_copying'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index 6b18f636b6..465191fee2 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -70,7 +70,7 @@ $result_trees{'a_comma_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index b566199ed8..2a26d4c072 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_zero'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index e069c55510..dd62314f16 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -183,7 +183,7 @@ $result_trees{'at_commands_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index 888fdf47bf..185d1e4282 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -30,7 +30,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -180,7 +180,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -216,7 +216,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index d4d531a9f1..25cf0ac4b2 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -27,7 +27,7 @@ $result_trees{'chapter_before_and_after_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -81,7 +81,7 @@ $result_trees{'chapter_before_and_after_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -124,7 +124,7 @@ $result_trees{'chapter_before_and_after_part'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 8b232bf47b..21549561c7 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -27,7 +27,7 @@ $result_trees{'chapter_before_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -81,7 +81,7 @@ $result_trees{'chapter_before_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 15c69e57e9..c919630c2c 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'chapter_between_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'chapter_between_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -102,7 +102,7 @@ $result_trees{'chapter_between_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -221,7 +221,7 @@ $result_trees{'chapter_between_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -297,7 +297,7 @@ $result_trees{'chapter_between_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -333,7 +333,7 @@ $result_trees{'chapter_between_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl 
b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
index 1dd5474b8a..bcc492a03a 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
@@ -30,7 +30,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -97,7 +97,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -216,7 +216,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -292,7 +292,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -328,7 +328,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
index b48ef5032b..a87e80c2c5 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -30,7 +30,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -99,7 +99,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -287,7 +287,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
index 1c04f06b33..1834bb16b6 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
@@ -30,7 +30,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -99,7 +99,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -287,7 +287,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 15ff46a033..9183d55692 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -37,7 +37,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -95,7 +95,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -216,7 +216,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -254,7 +254,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -290,7 +290,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index c17626c91b..ec088561ee 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -37,7 +37,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -134,7 +134,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -231,7 +231,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -318,7 +318,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -389,7 +389,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index 87f11340e9..84538d2955 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -35,7 +35,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'contents_and_parts'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -304,7 +304,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -342,7 +342,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -378,7 +378,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -419,7 +419,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -455,7 +455,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -495,7 +495,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -533,7 +533,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -569,7 +569,7 @@ $result_trees{'contents_and_parts'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 5134fbf72e..810d065c7f 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -30,7 +30,7 @@ $result_trees{'contents_in_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -68,7 +68,7 @@ $result_trees{'contents_in_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -108,7 +108,7 @@ $result_trees{'contents_in_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -148,7 +148,7 @@ $result_trees{'contents_in_html_text'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 8d3e4c3f1f..8b88e53c84 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -45,7 +45,7 @@ $result_trees{'contents_with_only_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index c6055337b1..3c23300bc0 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -30,7 +30,7 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -71,7 +71,7 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -208,7 +208,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -290,7 +290,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -372,7 +372,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -457,7 +457,7 @@ $result_trees{'double_node_anchor_float'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 4b462a6c63..0579a36368 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -28,7 +28,7 @@ $result_trees{'double_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -50,7 +50,7 @@ $result_trees{'double_part'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -178,7 +178,7 @@ $result_trees{'double_part'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -220,7 +220,7 @@ $result_trees{'double_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -274,7 +274,7 @@ $result_trees{'double_part'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -303,7 +303,7 @@ $result_trees{'double_part'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -363,7 +363,7 @@ $result_trees{'double_part'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
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 dd7672b65d..53b03f086b 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -35,7 +35,7 @@ $result_trees{'double_recursive_self_section_node_reference'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'double_recursive_self_section_node_reference'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -230,7 +230,7 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 7f4265ba19..7a0e78ba14 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
@@ -35,7 +35,7 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -230,7 +230,7 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 b1fbd29fbe..dac23c2d2a 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -35,7 +35,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -132,7 +132,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -189,7 +189,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index f6781b0de6..6396cf3fdf 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -49,7 +49,7 @@ $result_trees{'double_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -125,7 +125,7 @@ $result_trees{'double_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 118b627cb2..3e4cd468d7 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -49,7 +49,7 @@ $result_trees{'double_top_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -80,7 +80,7 @@ $result_trees{'double_top_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -283,7 +283,7 @@ $result_trees{'double_top_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index 44936dfe20..cabecbea1f 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -30,7 +30,7 @@ $result_trees{'double_top_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -82,7 +82,7 @@ $result_trees{'double_top_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index 6f3a0708b8..66b75e9142 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -120,7 +120,7 @@ $result_trees{'email_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/empty_node.pl 
b/tp/t/results/sectioning/empty_node.pl
index 6601873452..e7b3603b7f 100644
--- a/tp/t/results/sectioning/empty_node.pl
+++ b/tp/t/results/sectioning/empty_node.pl
@@ -25,7 +25,7 @@ $result_trees{'empty_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'empty_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index e0246fa743..d6a858164c 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -38,7 +38,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
@@ -102,7 +102,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
@@ -147,7 +147,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'info' => {
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index d6004dd185..ea34d0b584 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_ref_arg'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/empty_section_in_chapter.pl 
b/tp/t/results/sectioning/empty_section_in_chapter.pl
index e65a80d48a..6df631c396 100644
--- a/tp/t/results/sectioning/empty_section_in_chapter.pl
+++ b/tp/t/results/sectioning/empty_section_in_chapter.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_section_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'empty_section_in_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 5a87621e5c..d3c888f089 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -30,7 +30,7 @@ $result_trees{'equivalent_labels'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -115,7 +115,7 @@ $result_trees{'equivalent_labels'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -191,7 +191,7 @@ $result_trees{'equivalent_labels'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index 49c1918871..50d14e4e1c 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -62,7 +62,7 @@ $result_trees{'equivalent_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -84,7 +84,7 @@ $result_trees{'equivalent_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -232,7 +232,7 @@ $result_trees{'equivalent_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl 
b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
index dea414c3a7..0c9c31b356 100644
--- a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -82,7 +82,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index b22945a931..7da8f803a2 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -27,7 +27,7 @@ $result_trees{'explicit_node_directions'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -53,7 +53,7 @@ $result_trees{'explicit_node_directions'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -283,7 +283,7 @@ $result_trees{'explicit_node_directions'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -379,7 +379,7 @@ $result_trees{'explicit_node_directions'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index bb4bed9c78..c104e628c7 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'external_node_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -349,7 +349,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -389,7 +389,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -425,7 +425,7 @@ $result_trees{'external_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index f169d753cc..efa0f5ab4a 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -30,7 +30,7 @@ $result_trees{'hole_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -68,7 +68,7 @@ $result_trees{'hole_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -108,7 +108,7 @@ $result_trees{'hole_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -148,7 +148,7 @@ $result_trees{'hole_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -188,7 +188,7 @@ $result_trees{'hole_in_sectioning'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index 024baa2997..b8e4b34bbf 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -34,7 +34,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -70,7 +70,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -90,7 +90,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
                   "type" => "block_line_arg"
                 }
               ],
-              "type" => "argument"
+              "type" => "arguments_line"
             },
             {
               "contents" => [
@@ -224,7 +224,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -252,7 +252,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -286,7 +286,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -314,7 +314,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git 
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index 68dfaacc4c..a8db0502e0 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -34,7 +34,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node_menu'} 
= {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -70,7 +70,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node_menu'} 
= {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -90,7 +90,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node_menu'} 
= {
                   "type" => "block_line_arg"
                 }
               ],
-              "type" => "argument"
+              "type" => "arguments_line"
             },
             {
               "contents" => [
@@ -224,7 +224,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -252,7 +252,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -286,7 +286,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -314,7 +314,7 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index e203c63d7b..0c005fb3b2 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -43,7 +43,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -79,7 +79,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -99,7 +99,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                   "type" => "block_line_arg"
                 }
               ],
-              "type" => "argument"
+              "type" => "arguments_line"
             },
             {
               "contents" => [
@@ -435,7 +435,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -471,7 +471,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -505,7 +505,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -533,7 +533,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -567,7 +567,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -595,7 +595,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -634,7 +634,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -670,7 +670,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -709,7 +709,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -745,7 +745,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -784,7 +784,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -820,7 +820,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index d34e0bb59d..c555b0d498 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -43,7 +43,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -79,7 +79,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -99,7 +99,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                   "type" => "block_line_arg"
                 }
               ],
-              "type" => "argument"
+              "type" => "arguments_line"
             },
             {
               "contents" => [
@@ -435,7 +435,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -471,7 +471,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -505,7 +505,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -533,7 +533,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -567,7 +567,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {},
@@ -595,7 +595,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -634,7 +634,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -670,7 +670,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -709,7 +709,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -745,7 +745,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
@@ -784,7 +784,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         }
       ],
       "extra" => {
@@ -820,7 +820,7 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
               "type" => "line_arg"
             }
           ],
-          "type" => "argument"
+          "type" => "arguments_line"
         },
         {
           "text" => "\n",
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 6e6dacf1e7..cd90052710 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -27,7 +27,7 @@ $result_trees{'lone_Top_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'lone_Top_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -93,7 +93,7 @@ $result_trees{'lone_Top_node'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -215,7 +215,7 @@ $result_trees{'lone_Top_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 16eae698fe..7a03f3958b 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'loop_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'loop_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -234,7 +234,7 @@ $result_trees{'loop_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -256,7 +256,7 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -400,7 +400,7 @@ $result_trees{'loop_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -422,7 +422,7 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -544,7 +544,7 @@ $result_trees{'loop_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 366fe8c525..0e551e6057 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -24,7 +24,7 @@ $result_trees{'menutextorder'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -217,7 +217,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -239,7 +239,7 @@ $result_trees{'menutextorder'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -360,7 +360,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -396,7 +396,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -436,7 +436,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -472,7 +472,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -517,7 +517,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -553,7 +553,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -575,7 +575,7 @@ $result_trees{'menutextorder'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -788,7 +788,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -824,7 +824,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -864,7 +864,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -900,7 +900,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -940,7 +940,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -976,7 +976,7 @@ $result_trees{'menutextorder'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index da7f33717f..28db09fd2a 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -30,7 +30,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -243,7 +243,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -265,7 +265,7 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -432,7 +432,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -468,7 +468,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -490,7 +490,7 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -611,7 +611,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -647,7 +647,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/next_no_prev_to_node.pl 
b/tp/t/results/sectioning/next_no_prev_to_node.pl
index a6a53842e4..ade609c6e5 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -30,7 +30,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'next_no_prev_to_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -263,7 +263,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -329,7 +329,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 36e675db8c..0e4d17e274 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -56,7 +56,7 @@ $result_trees{'no_argument_and_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -102,7 +102,7 @@ $result_trees{'no_argument_and_contents'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index de7c11bbe0..625a75539e 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -61,7 +61,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -94,7 +94,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -130,7 +130,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -206,7 +206,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -246,7 +246,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -282,7 +282,7 @@ $result_trees{'no_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index 85d2c01f95..c1bf3b55b0 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -32,7 +32,7 @@ $result_trees{'node_empty_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index acc48019f3..9c1a8629fb 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -37,7 +37,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -92,7 +92,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -168,7 +168,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -265,7 +265,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -362,7 +362,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -412,7 +412,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -546,7 +546,7 @@ $result_trees{'node_line_arguments'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index d31da5d875..f909d9a910 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -30,7 +30,7 @@ $result_trees{'node_nested_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'node_nested_parentheses'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 1b9476e9be..d94b831490 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -27,7 +27,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -259,7 +259,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -300,7 +300,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -346,7 +346,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -389,7 +389,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -439,7 +439,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 610a71fef1..5de089d09a 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -27,7 +27,7 @@ $result_trees{'node_part_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'node_part_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -237,7 +237,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -287,7 +287,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index 4a513d34a2..ccf0165313 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'node_referenced_in_ref'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -212,7 +212,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -253,7 +253,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index 6689ab98ad..db027941dd 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -35,7 +35,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index c9c8894dbd..3e7ad687c2 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -35,7 +35,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -123,7 +123,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -214,7 +214,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/node_simple.pl 
b/tp/t/results/sectioning/node_simple.pl
index 60d46b5286..94c92c4cea 100644
--- a/tp/t/results/sectioning/node_simple.pl
+++ b/tp/t/results/sectioning/node_simple.pl
@@ -24,7 +24,7 @@ $result_trees{'node_simple'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index 2c335182a3..f28d316cc8 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -66,7 +66,7 @@ $result_trees{'node_too_much_args'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index a2d142b189..53073899f6 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -66,7 +66,7 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index aa3bdb3451..80d1253181 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -27,7 +27,7 @@ $result_trees{'node_up_external_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'node_up_external_node'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -264,7 +264,7 @@ $result_trees{'node_up_external_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 620d395f58..2531e5efdd 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -30,7 +30,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -349,7 +349,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -403,7 +403,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -439,7 +439,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -574,7 +574,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -610,7 +610,7 @@ $result_trees{'nodename_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
index 964d04f729..1ca0b6f1f3 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 124e41e349..29596ae506 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -27,7 +27,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -53,7 +53,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -283,7 +283,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -379,7 +379,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -417,7 +417,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index 246b459f7c..6ad8a61596 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -35,7 +35,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index b58a0b636a..21f99d2d64 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index a859f32f65..64f3e07a8c 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -403,7 +403,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
index 6bcb7fac77..5cffb4e2e1 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
@@ -35,7 +35,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
index 639f9bbd3c..7c58e759be 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index fb47e84db8..a0f6a9759b 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -27,7 +27,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -53,7 +53,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -283,7 +283,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -379,7 +379,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -417,7 +417,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index c566f1ad11..20ac91df95 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                     'type' => 'block_line_arg'
                   }
                 ],
-                'type' => 'argument'
+                'type' => 'arguments_line'
               },
               {
                 'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -403,7 +403,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
index bbd8a0ad9d..0cdfd70d7e 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
index 2e9f387eb4..8ca4c38aca 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
index be04e3b876..1aeb018076 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
@@ -35,7 +35,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -282,7 +282,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -408,7 +408,7 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 730ada0bc4..0d01fc4afd 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -35,7 +35,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -90,7 +90,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -178,7 +178,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -233,7 +233,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -269,7 +269,7 @@ $result_trees{'nodes_before_after_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index dc12383cb6..fc6af7ee8a 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -85,7 +85,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -107,7 +107,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -311,7 +311,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -347,7 +347,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -369,7 +369,7 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -488,7 +488,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -524,7 +524,7 @@ $result_trees{'nodes_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index a34171a152..83f9410d6c 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -54,7 +54,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -85,7 +85,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index ab84e45235..ab3680471f 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -74,7 +74,7 @@ $result_trees{'novalidate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -96,7 +96,7 @@ $result_trees{'novalidate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 face8eece1..88699ead84 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -57,7 +57,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
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 a56a1ecca0..b812e6140f 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
@@ -57,7 +57,7 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 279c2e3b3d..58ccb46f89 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -35,7 +35,7 @@ $result_trees{'one_subsection'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 700f8d6385..c399d104ef 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -30,7 +30,7 @@ $result_trees{'one_subsection_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'one_subsection_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index ebf700a37a..c6793d13bf 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -27,7 +27,7 @@ $result_trees{'part_before_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -51,7 +51,7 @@ $result_trees{'part_before_chapter'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 47f4fe6aee..3f46aec6a7 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -27,7 +27,7 @@ $result_trees{'part_before_section'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -51,7 +51,7 @@ $result_trees{'part_before_section'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index ebc814637d..6c6739320e 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_before_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -51,7 +51,7 @@ $result_trees{'part_before_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 6779d9347d..721faa2ed6 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_chapter_after_top'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'part_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -237,7 +237,7 @@ $result_trees{'part_chapter_after_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -288,7 +288,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index 2d6e63a074..ef06ad291a 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -37,7 +37,7 @@ $result_trees{'part_chapter_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -75,7 +75,7 @@ $result_trees{'part_chapter_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -116,7 +116,7 @@ $result_trees{'part_chapter_appendix'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index 0eb0f9b5bf..5e1cb39795 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_after_top'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'part_node_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -209,7 +209,7 @@ $result_trees{'part_node_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -249,7 +249,7 @@ $result_trees{'part_node_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index b86e2167e4..f446f83877 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_before_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_before_top'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -154,7 +154,7 @@ $result_trees{'part_node_before_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -246,7 +246,7 @@ $result_trees{'part_node_before_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'part_node_before_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index 05a30cc7ef..9291dbe9d4 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -259,7 +259,7 @@ $result_trees{'part_node_chapter_after_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -395,7 +395,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -488,7 +488,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 4bf85adbdb..d2bb1d8e7f 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_chapter_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'part_node_chapter_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -242,7 +242,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -293,7 +293,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -334,7 +334,7 @@ $result_trees{'part_node_chapter_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 725e708c89..ddfb7d973b 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -259,7 +259,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -288,7 +288,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -339,7 +339,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -380,7 +380,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -416,7 +416,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index 999d4400ce..136b5e6113 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -259,7 +259,7 @@ $result_trees{'part_node_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -288,7 +288,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -339,7 +339,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -380,7 +380,7 @@ $result_trees{'part_node_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -404,7 +404,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -454,7 +454,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 854775f159..6409c5f957 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_part_appendix'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -213,7 +213,7 @@ $result_trees{'part_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -242,7 +242,7 @@ $result_trees{'part_node_part_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -293,7 +293,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -334,7 +334,7 @@ $result_trees{'part_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -358,7 +358,7 @@ $result_trees{'part_node_part_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index a386a474d4..46a6ee048a 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_part_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -259,7 +259,7 @@ $result_trees{'part_node_part_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -288,7 +288,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -339,7 +339,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -380,7 +380,7 @@ $result_trees{'part_node_part_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -404,7 +404,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -455,7 +455,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/part_section_part.pl 
b/tp/t/results/sectioning/part_section_part.pl
index d5df61cdd6..697157c917 100644
--- a/tp/t/results/sectioning/part_section_part.pl
+++ b/tp/t/results/sectioning/part_section_part.pl
@@ -30,7 +30,7 @@ $result_trees{'part_section_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -68,7 +68,7 @@ $result_trees{'part_section_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'part_section_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 9aec305b05..e3c577c9f9 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -37,7 +37,7 @@ $result_trees{'protected_node_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'protected_node_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -95,7 +95,7 @@ $result_trees{'protected_node_parentheses'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -247,7 +247,7 @@ $result_trees{'protected_node_parentheses'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index 3bafe788e3..25e18458a2 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -35,7 +35,7 @@ $result_trees{'recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -95,7 +95,7 @@ $result_trees{'recursive_self_section_reference'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index b356228827..12d1be6f58 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -37,7 +37,7 @@ $result_trees{'ref_to_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'ref_to_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
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 0adce6489b..ff96c2b00b 100644
--- a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
@@ -45,7 +45,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -82,7 +82,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -121,7 +121,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -158,7 +158,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -270,7 +270,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -320,7 +320,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index efc6b6afe4..7e7dd70a1d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -35,7 +35,7 @@ $result_trees{'section_before_after_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'section_before_after_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'section_before_after_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'section_before_after_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index cd3e07b446..5d43a3833d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -35,7 +35,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -73,7 +73,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -109,7 +109,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -201,7 +201,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index 662b78d9a9..74131160b5 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -30,7 +30,7 @@ $result_trees{'section_before_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'section_before_chapter'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index b9a31b5226..b7645458bc 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -35,7 +35,7 @@ $result_trees{'section_before_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -75,7 +75,7 @@ $result_trees{'section_before_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 6bdd1259e3..a76e7e1b00 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -52,7 +52,7 @@ $result_trees{'section_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -88,7 +88,7 @@ $result_trees{'section_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -128,7 +128,7 @@ $result_trees{'section_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -164,7 +164,7 @@ $result_trees{'section_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -186,7 +186,7 @@ $result_trees{'section_before_top'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index b7c4aad4db..142e6c0e3b 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -30,7 +30,7 @@ $result_trees{'section_before_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'section_before_top_no_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 1052f3e401..7208679175 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -66,7 +66,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -102,7 +102,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -138,7 +138,7 @@ $result_trees{'section_below_unnumbered'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -262,7 +262,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -298,7 +298,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -320,7 +320,7 @@ $result_trees{'section_below_unnumbered'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -439,7 +439,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -475,7 +475,7 @@ $result_trees{'section_below_unnumbered'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index aadaafcde3..acbcc40774 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -35,7 +35,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -68,7 +68,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index 9188ac6983..9da6ed4fca 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -30,7 +30,7 @@ $result_trees{'section_chapter_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'section_chapter_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -110,7 +110,7 @@ $result_trees{'section_chapter_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index a40e6a6f75..12e8195292 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -111,7 +111,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -147,7 +147,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -169,7 +169,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -290,7 +290,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -326,7 +326,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -348,7 +348,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 52419aad47..63b2f8a468 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -37,7 +37,7 @@ $result_trees{'section_node_before_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -73,7 +73,7 @@ $result_trees{'section_node_before_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -113,7 +113,7 @@ $result_trees{'section_node_before_part'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index 29117c8e6f..cdc04ce6c5 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -30,7 +30,7 @@ $result_trees{'sections'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 622e1010c4..95fea16962 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -30,7 +30,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'semi_auto'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -253,7 +253,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -289,7 +289,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -311,7 +311,7 @@ $result_trees{'semi_auto'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -432,7 +432,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -468,7 +468,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -551,7 +551,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -587,7 +587,7 @@ $result_trees{'semi_auto'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index eb9c78a079..75e0572809 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -35,7 +35,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -95,7 +95,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 4a5ac118c3..34653046bf 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -37,7 +37,7 @@ $result_trees{'space_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -59,7 +59,7 @@ $result_trees{'space_in_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -290,7 +290,7 @@ $result_trees{'space_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -331,7 +331,7 @@ $result_trees{'space_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -372,7 +372,7 @@ $result_trees{'space_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/split_for_format_not_split.pl 
b/tp/t/results/sectioning/split_for_format_not_split.pl
index 429cd475d3..da3ee86c41 100644
--- a/tp/t/results/sectioning/split_for_format_not_split.pl
+++ b/tp/t/results/sectioning/split_for_format_not_split.pl
@@ -50,7 +50,7 @@ $result_trees{'split_for_format_not_split'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index 6c59d21182..885ced69a4 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -30,7 +30,7 @@ $result_trees{'top_no_argument_and_content'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index 5c7d7815e4..9c1101c424 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -30,7 +30,7 @@ $result_trees{'top_no_argument_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -61,7 +61,7 @@ $result_trees{'top_no_argument_and_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index cf78e677c5..fdcc16b3f4 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -30,7 +30,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -61,7 +61,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl 
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index b5a518b1c2..ecd7c2f208 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -30,7 +30,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'top_node_no_menu_direction'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -255,7 +255,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 7983346264..1e4a991bcd 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -27,7 +27,7 @@ $result_trees{'top_node_part_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -51,7 +51,7 @@ $result_trees{'top_node_part_top'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
@@ -108,7 +108,7 @@ $result_trees{'top_node_part_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 6107593d7a..3bc565dba6 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -27,7 +27,7 @@ $result_trees{'top_part_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -74,7 +74,7 @@ $result_trees{'top_part_chapter'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -98,7 +98,7 @@ $result_trees{'top_part_chapter'} = [
                   'type' => 'line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 1da0371a75..ce644653d9 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -54,7 +54,7 @@ $result_trees{'top_without_node_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -94,7 +94,7 @@ $result_trees{'top_without_node_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -142,7 +142,7 @@ $result_trees{'top_without_node_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index 35829fa043..e3a7514d69 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'top_without_node_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -83,7 +83,7 @@ $result_trees{'top_without_node_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -160,7 +160,7 @@ $result_trees{'top_without_node_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl 
b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
index d5b2fa2892..8bae5a8ab3 100644
--- a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 7464e4a89b..355e58b952 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -27,7 +27,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -316,7 +316,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -367,7 +367,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -409,7 +409,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -469,7 +469,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 1bb237867c..f2bb949067 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -27,7 +27,7 @@ $result_trees{'two_nodes_at_the_end'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -269,7 +269,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -310,7 +310,7 @@ $result_trees{'two_nodes_at_the_end'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -412,7 +412,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -504,7 +504,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
index 7b66df040d..cb6898c563 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -365,7 +365,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -401,7 +401,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -441,7 +441,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -496,7 +496,7 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
index fbf4b2e0e3..bf2a36c67d 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
@@ -35,7 +35,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -365,7 +365,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -401,7 +401,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -441,7 +441,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -496,7 +496,7 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index be6651841e..cfac51d5fe 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -27,7 +27,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -49,7 +49,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -269,7 +269,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -310,7 +310,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -412,7 +412,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -449,7 +449,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -494,7 +494,7 @@ $result_trees{'two_nodes_between_chapters'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -530,7 +530,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
index ec71ed43df..7f2839aca4 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
@@ -35,7 +35,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -365,7 +365,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -401,7 +401,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -441,7 +441,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -482,7 +482,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
index c0c5ba9389..157f452def 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
@@ -35,7 +35,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -93,7 +93,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -365,7 +365,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -401,7 +401,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -441,7 +441,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -482,7 +482,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -518,7 +518,7 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index 2535a98104..7d69e961b7 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -30,7 +30,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
@@ -53,7 +53,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
index f14cf74507..e81997924d 100644
--- a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
@@ -69,7 +69,7 @@ $result_trees{'unknown_node_direction_novalidate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index d657c96bdf..84cc79acb7 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -30,7 +30,7 @@ $result_trees{'unknown_node_in_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -52,7 +52,7 @@ $result_trees{'unknown_node_in_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
index 1b3c8d9f5a..4494af0a72 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
@@ -50,7 +50,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -72,7 +72,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index d66679e29c..26032b2f52 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -27,7 +27,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -131,7 +131,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index 727a4ca4db..051c35be9f 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -30,7 +30,7 @@ $result_trees{'unnumbered_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -68,7 +68,7 @@ $result_trees{'unnumbered_before_top'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index a4968a156d..1bc0430038 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -27,7 +27,7 @@ $result_trees{'unnumbered_before_top_node'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -70,7 +70,7 @@ $result_trees{'unnumbered_before_top_node'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
diff --git a/tp/t/results/sectioning/unnumbered_no_argument.pl 
b/tp/t/results/sectioning/unnumbered_no_argument.pl
index cff5f7691f..31bdb0aa67 100644
--- a/tp/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/unnumbered_no_argument.pl
@@ -25,7 +25,7 @@ $result_trees{'unnumbered_no_argument'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {},
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index ac330226c2..89c87a7b4b 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -54,7 +54,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -95,7 +95,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
@@ -147,7 +147,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'contents' => [
@@ -225,7 +225,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -263,7 +263,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 6f7c87600c..b1da4e4c08 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -27,7 +27,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -115,7 +115,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
@@ -156,7 +156,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -209,7 +209,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -286,7 +286,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           }
         ],
         'extra' => {
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index fb3a23bbc5..1a57f8b89f 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -50,7 +50,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -164,7 +164,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -195,7 +195,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index c7d1398b90..169f7ab1f6 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -50,7 +50,7 @@ $result_trees{'index_entries_relate_to_item_transformation'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -87,7 +87,7 @@ $result_trees{'index_entries_relate_to_item_transformation'} 
= {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -126,7 +126,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -164,7 +164,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -195,7 +195,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 157c9da35e..2d7596e06d 100644
--- a/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
+++ b/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
@@ -30,7 +30,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -63,7 +63,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -101,7 +101,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -163,7 +163,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -212,7 +212,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -253,7 +253,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -289,7 +289,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -329,7 +329,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -362,7 +362,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -397,7 +397,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -430,7 +430,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -484,7 +484,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -526,7 +526,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -566,7 +566,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -599,7 +599,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -642,7 +642,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -675,7 +675,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -718,7 +718,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -746,7 +746,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -787,7 +787,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -828,7 +828,7 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index e1b63cf691..5c8e06fd80 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -88,7 +88,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -125,7 +125,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -147,7 +147,7 @@ $result_trees{'master_menu_fr'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -226,7 +226,7 @@ $result_trees{'master_menu_fr'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -409,7 +409,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -446,7 +446,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -468,7 +468,7 @@ $result_trees{'master_menu_fr'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -593,7 +593,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -630,7 +630,7 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl 
b/tp/t/results/transformations/protect_colon_source_mark.pl
index b0984a0096..9d803bfec1 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_colon_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'some text : \\arg\\ then more
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl 
b/tp/t/results/transformations/protect_comma_source_mark.pl
index d7e72e40d5..9aeaaae2ab 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_comma_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'some text ,,
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 3ce3392626..1274462e2c 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
@@ -20,7 +20,7 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(
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 9bea87f84c..4ec16d49f7 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -20,7 +20,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '(some text) aa,,
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 27ffaedc26..ce26a24206 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
@@ -32,7 +32,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                       'type' => 'macro_line'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'text' => '#line 30 "toto"
@@ -150,7 +150,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '#
@@ -264,7 +264,7 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '\\arg\\ "titi" 3\\arg\\
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 85053f8171..f4ca33af6b 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
@@ -20,7 +20,7 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'some text .,
diff --git 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
index 1c4adb0e33..56ccc74a22 100644
--- 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
+++ 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
@@ -30,7 +30,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -207,7 +207,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -243,7 +243,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git 
a/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl 
b/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
index 1db425760a..e30d936382 100644
--- a/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
+++ b/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
@@ -30,7 +30,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -88,7 +88,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -175,7 +175,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -355,7 +355,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -391,7 +391,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -431,7 +431,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -467,7 +467,7 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/value/set_in_item_missing_line.pl 
b/tp/t/results/value/set_in_item_missing_line.pl
index a6c5dbb1ea..e38f69c5c3 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -32,7 +32,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -190,7 +190,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index f3bdb86483..f98d767329 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -32,7 +32,7 @@ $result_trees{'set_on_item_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -278,7 +278,7 @@ $result_trees{'set_on_item_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 1252e9e052..1175e1106c 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -478,7 +478,7 @@ $result_trees{'value_in_index_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -514,7 +514,7 @@ $result_trees{'value_in_index_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'source_marks' => [
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 9672a868ef..ffb5a22584 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -54,7 +54,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -156,7 +156,7 @@ $result_trees{'value_in_misc_commands'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -310,7 +310,7 @@ $result_trees{'value_in_misc_commands'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -664,7 +664,7 @@ $result_trees{'value_in_misc_commands'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -922,7 +922,7 @@ $result_trees{'value_in_misc_commands'} = {
                         'type' => 'block_line_arg'
                       }
                     ],
-                    'type' => 'argument'
+                    'type' => 'arguments_line'
                   }
                 ],
                 'source_info' => {
@@ -1614,7 +1614,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 0d5651b1e9..81b2bce524 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -130,7 +130,7 @@ $result_trees{'value_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -166,7 +166,7 @@ $result_trees{'value_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -188,7 +188,7 @@ $result_trees{'value_in_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -390,7 +390,7 @@ $result_trees{'value_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -448,7 +448,7 @@ $result_trees{'value_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -492,7 +492,7 @@ $result_trees{'value_in_node'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -688,7 +688,7 @@ $result_trees{'value_in_node'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 7644e365ac..091bb35478 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -155,7 +155,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -219,7 +219,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -425,7 +425,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -548,7 +548,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -584,7 +584,7 @@ $result_trees{'value_node_directions'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
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 5e9b8d1764..c2f87beed1 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
@@ -42,7 +42,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\arg1\\} protected \\\\ -> 
\\\\arg1\\\\ @emph{\\arg2\\}
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 20d384d3b5..07579cecdb 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_in_value'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'a
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 77ab4c01f9..517f6bebc1 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
@@ -42,7 +42,7 @@ $result_trees{'value_in_macro_body'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\@value{bodyarg}\\  }
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index b1bf9a8daa..39f7fa98c6 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -42,7 +42,7 @@ $result_trees{'value_in_macro_formal_arg'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\ 
with value \\the@value{argument}\\
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index a8b89b48e5..09e733a383 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -205,7 +205,7 @@ $result_trees{'commands_and_spaces'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -519,7 +519,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -611,7 +611,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -793,7 +793,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -913,7 +913,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -978,7 +978,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim @g 
@@ -1040,7 +1040,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1106,7 +1106,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1180,7 +1180,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 05cbae7c1d..79d9e82fb7 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -32,7 +32,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -125,7 +125,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -202,7 +202,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -388,7 +388,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -463,7 +463,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -567,7 +567,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -715,7 +715,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -800,7 +800,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -875,7 +875,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 6e0eeb4aee..8a82d4040f 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
@@ -38,7 +38,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -141,7 +141,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -244,7 +244,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -355,7 +355,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -450,7 +450,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -553,7 +553,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'item',
@@ -659,7 +659,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -767,7 +767,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -852,7 +852,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -929,7 +929,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1006,7 +1006,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1121,7 +1121,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1230,7 +1230,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1347,7 +1347,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1424,7 +1424,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1533,7 +1533,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1695,7 +1695,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1842,7 +1842,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1924,7 +1924,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2001,7 +2001,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
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 168ea02c55..9a48575cb8 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -96,7 +96,7 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -132,7 +132,7 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -218,7 +218,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -361,7 +361,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'image',
@@ -454,7 +454,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -669,7 +669,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -981,7 +981,7 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -1033,7 +1033,7 @@ $result_trees{'image_inline_or_not'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -1207,7 +1207,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '
diff --git a/tp/t/results/xml_tests/macro_and_args.pl 
b/tp/t/results/xml_tests/macro_and_args.pl
index 96b7df8881..a7dc0a1d8e 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -20,7 +20,7 @@ $result_trees{'macro_and_args'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
@@ -80,7 +80,7 @@ $result_trees{'macro_and_args'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/xml_tests/raw.pl b/tp/t/results/xml_tests/raw.pl
index fec736216e..78f775e027 100644
--- a/tp/t/results/xml_tests/raw.pl
+++ b/tp/t/results/xml_tests/raw.pl
@@ -24,7 +24,7 @@ $result_trees{'raw'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -96,7 +96,7 @@ $result_trees{'raw'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index b2e775a206..d80b83b2a0 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -30,7 +30,7 @@ $result_trees{'raw_and_comments'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -122,7 +122,7 @@ $result_trees{'raw_and_comments'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl 
b/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
index 503b53d8fc..4059361b0c 100644
--- a/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
+++ b/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
@@ -30,7 +30,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -118,7 +118,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -154,7 +154,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -208,7 +208,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -244,7 +244,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -298,7 +298,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -334,7 +334,7 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/xml_tests/sectioning_test_ref.pl 
b/tp/t/results/xml_tests/sectioning_test_ref.pl
index 1575b18b07..7dfe99ef0a 100644
--- a/tp/t/results/xml_tests/sectioning_test_ref.pl
+++ b/tp/t/results/xml_tests/sectioning_test_ref.pl
@@ -30,7 +30,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -118,7 +118,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -154,7 +154,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -208,7 +208,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -244,7 +244,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -298,7 +298,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -334,7 +334,7 @@ $result_trees{'sectioning_test_ref'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index c64f8b54f1..320385858d 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -29,7 +29,7 @@ $result_trees{'spaces_info_lost'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'spaces_info_lost'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => 'in verbatim @g 
diff --git a/tp/t/results/xml_tests/top_node_and_bye.pl 
b/tp/t/results/xml_tests/top_node_and_bye.pl
index 374376c440..70f07bd804 100644
--- a/tp/t/results/xml_tests/top_node_and_bye.pl
+++ b/tp/t/results/xml_tests/top_node_and_bye.pl
@@ -31,7 +31,7 @@ $result_trees{'top_node_and_bye'} = [
                 'type' => 'line_arg'
               }
             ],
-            'type' => 'argument'
+            'type' => 'arguments_line'
           },
           {
             'text' => '
diff --git a/tp/t/results/xml_tests/top_node_no_section.pl 
b/tp/t/results/xml_tests/top_node_no_section.pl
index 175e3b5ce2..b0f3987044 100644
--- a/tp/t/results/xml_tests/top_node_no_section.pl
+++ b/tp/t/results/xml_tests/top_node_no_section.pl
@@ -30,7 +30,7 @@ $result_trees{'top_node_no_section'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index d4c11221b8..877a3f173b 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -38,7 +38,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -212,7 +212,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -387,7 +387,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -503,7 +503,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -619,7 +619,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -740,7 +740,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -866,7 +866,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 8b1a30faef..ae409f5c52 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -30,7 +30,7 @@ $result_trees{'block_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'block_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -104,7 +104,7 @@ $result_trees{'block_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -140,7 +140,7 @@ $result_trees{'block_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -170,7 +170,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -311,7 +311,7 @@ $result_trees{'block_commands_in_table'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -479,7 +479,7 @@ $result_trees{'block_commands_in_table'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -592,7 +592,7 @@ $result_trees{'block_commands_in_table'} = {
                               'type' => 'block_line_arg'
                             }
                           ],
-                          'type' => 'argument'
+                          'type' => 'arguments_line'
                         },
                         {
                           'contents' => [
@@ -715,7 +715,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -931,7 +931,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1125,7 +1125,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index bc88bf5c1c..328d052239 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -32,7 +32,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index c2c7fbb423..6ef81adbf0 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -79,7 +79,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 06b4aff7cc..e5d7749f8a 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -32,7 +32,7 @@ $result_trees{'empty_item_itemx'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/empty_table.pl 
b/tp/t/results/xtable/empty_table.pl
index 1a02ad08a4..0f60a1385a 100644
--- a/tp/t/results/xtable/empty_table.pl
+++ b/tp/t/results/xtable/empty_table.pl
@@ -32,7 +32,7 @@ $result_trees{'empty_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'end',
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index f4e57f9668..efde950ff4 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -32,7 +32,7 @@ $result_trees{'headitem_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl 
b/tp/t/results/xtable/index_command_before_end_table.pl
index 28c78dc9ac..7037fe880f 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -37,7 +37,7 @@ $result_trees{'index_command_before_end_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 6837550454..ce857fcd4b 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -35,7 +35,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -71,7 +71,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -109,7 +109,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -145,7 +145,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -175,7 +175,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -316,7 +316,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -496,7 +496,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -845,7 +845,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1051,7 +1051,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1221,7 +1221,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1381,7 +1381,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1551,7 +1551,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1711,7 +1711,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1872,7 +1872,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2028,7 +2028,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -2184,7 +2184,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 8d0e43453a..e0f6c37dc0 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -27,7 +27,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'table',
@@ -52,7 +52,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl 
b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
index c590ead6ca..3f443b54e4 100644
--- a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
+++ b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
@@ -32,7 +32,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/item_index_transformation.pl 
b/tp/t/results/xtable/item_index_transformation.pl
index e38925c2e1..6052808feb 100644
--- a/tp/t/results/xtable/item_index_transformation.pl
+++ b/tp/t/results/xtable/item_index_transformation.pl
@@ -30,7 +30,7 @@ $result_trees{'item_index_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         }
       ],
       'extra' => {
@@ -66,7 +66,7 @@ $result_trees{'item_index_transformation'} = {
               'type' => 'line_arg'
             }
           ],
-          'type' => 'argument'
+          'type' => 'arguments_line'
         },
         {
           'text' => '
@@ -96,7 +96,7 @@ $result_trees{'item_index_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -439,7 +439,7 @@ $result_trees{'item_index_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -746,7 +746,7 @@ $result_trees{'item_index_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
@@ -1026,7 +1026,7 @@ $result_trees{'item_index_transformation'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index 28e038ecef..d44f5a4f75 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -32,7 +32,7 @@ $result_trees{'itemx_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 4858d5b92c..219ddcb210 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -32,7 +32,7 @@ $result_trees{'long_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl 
b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
index 4ef732a127..3e19452cd7 100644
--- a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
+++ b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
@@ -38,7 +38,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/no_argument_for_table.pl 
b/tp/t/results/xtable/no_argument_for_table.pl
index 20b9b564a8..6a573f91f7 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -32,7 +32,7 @@ $result_trees{'no_argument_for_table'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 14b5bdd292..32adfc453b 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -20,7 +20,7 @@ $result_trees{'table_nested'} = {
                   'type' => 'macro_line'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'text' => '@vtable @asis
@@ -213,7 +213,7 @@ $result_trees{'table_nested'} = {
                   'status' => 'start'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'vtable',
@@ -239,7 +239,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -538,7 +538,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -770,7 +770,7 @@ $result_trees{'table_nested'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'source_marks' => [
@@ -817,7 +817,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1116,7 +1116,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'block_line_arg'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'contents' => [
@@ -1348,7 +1348,7 @@ $result_trees{'table_nested'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'cmdname' => 'quotation',
@@ -1383,7 +1383,7 @@ $result_trees{'table_nested'} = {
                       'status' => 'start'
                     }
                   ],
-                  'type' => 'argument'
+                  'type' => 'arguments_line'
                 },
                 {
                   'cmdname' => 'vtable',
@@ -1409,7 +1409,7 @@ $result_trees{'table_nested'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
@@ -1708,7 +1708,7 @@ $result_trees{'table_nested'} = {
                           'type' => 'block_line_arg'
                         }
                       ],
-                      'type' => 'argument'
+                      'type' => 'arguments_line'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl 
b/tp/t/results/xtable/text_between_item_itemx.pl
index 9bdc6777c5..00c29215ec 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -32,7 +32,7 @@ $result_trees{'text_between_item_itemx'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl 
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index 101d8160d0..4311739e99 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -32,7 +32,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                   'type' => 'block_line_arg'
                 }
               ],
-              'type' => 'argument'
+              'type' => 'arguments_line'
             },
             {
               'contents' => [



reply via email to

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